From 9f6dad5ab33d8994d4c09917b564dbc55482b39c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 31 May 2023 19:33:48 +0100 Subject: [PATCH 001/221] c-ares: ensure passthru.tests' curl is built with c-ares support kinda pointless otherwise --- pkgs/development/libraries/c-ares/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 9c024211a71b..24536908fbf0 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit curl grpc; + inherit grpc; + curl = (curl.override { c-aresSupport = true; }).tests.withCheck; }; meta = with lib; { From d746f25d19551a98a7890045bc5896c91346360e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 21 Jul 2023 19:22:50 -0400 Subject: [PATCH 002/221] curl: Fix cross-compilation to Windows by not forcing gssSupport MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit E.g. `nix build .#pkgsCross.mingwW64.curl` would fail. The params for curl already have `gssSupport = !isStatic && …`, so removing this doesn’t really have any effect since it’s already `true` when possible and `false` for static platforms. --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 951b7b41e4df..7cf2310d1c5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7001,7 +7001,6 @@ with pkgs; idnSupport = true; zstdSupport = true; } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { - gssSupport = true; brotliSupport = true; }); From 896b2b9dbdd372d00e36c7275b5f3a8824a0652d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Aug 2023 14:42:57 +0200 Subject: [PATCH 003/221] ArchiSteamFarm: 5.4.7.3 -> 5.4.8.3 --- .../misc/ArchiSteamFarm/default.nix | 4 ++-- .../applications/misc/ArchiSteamFarm/deps.nix | 20 +++++++++---------- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 0dbcf051c3c9..5d335a5325d1 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.7.3"; + version = "5.4.8.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-xxHNMqFHxFVbKpy9JHHif4GZ/jk9CUUwgyPWmlTXgcc="; + hash = "sha256-ySiN5iPs+EtgzPJJpKvD7BR3Z2xa4HLnTEtqroW478w="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 40c6bf53a7c0..3b621fe971be 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -56,12 +56,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.31.0"; sha256 = "1amf0yp5fqdkrr2r6nscpw1h1r3gghhxbczk6j255smdhhy0dzv9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,14 +71,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.3"; sha256 = "1f2b9ljc3l6lk2qq3ps6pzb5r4dvqvs9j1xav8kj2yy52i2dbz7r"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.3"; sha256 = "0czzs36ybgipn9bga2swkdd653vh0wvs5hsi2lgykhblimdmb947"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.3"; sha256 = "0yi0n8jxf4l6v8bscgi8ws9zf5i84213pf1qj5d7nwx4jb05m23l"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.4"; sha256 = "02jffh6kmkccakr51v3iwwq3281sypdilpjjf845dwrsl9ksf73k"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.4"; sha256 = "0dz0mn6bp3bb650k992mr2lga7xn1xc3qfbdfivgknfccyy8d6k8"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) @@ -86,9 +86,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.0"; sha256 = "1j27wrjxjpfy10s5182d477y6qb50fdak6r0vx44bbsakmv0zv3s"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.0"; sha256 = "08rlrag6ilxn1wyd5ivsny0rgidsn3imsx5bqjwv5dlwdjh5acfh"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.0"; sha256 = "1fmdp6bjzcj1nfpnlzcyszl8jnmr35gd79ngqx6cikpg8xpyczhr"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.2"; sha256 = "1r3r2sm97lirfd4sb8vhshl8iy9pg006glrgagapxhrh5kapn44g"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.2"; sha256 = "1ixfyx1pg5j7id6kr3blxpbffmzhw9944ha1k6bp8l41rzcny4z8"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.2"; sha256 = "0251bi5fwqx1vvndw604lsgmhaq1sn74kfmpn5i3nr2j7rs5lyax"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index c04eb6811d0d..6c0e749b2085 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -9,11 +9,11 @@ buildNpmPackage { repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "0dc9b31a571fe840ac1661b9e9777f253304529d"; - hash = "sha256-gY+4H6roqqoRFTwyNboXKg8LM7BfxQYYij/eilohFNY="; + rev = "578e8eacf9eb0367d864ed741017dce23415c1be"; + hash = "sha256-It76gyrTPiZFEj9aSFKwAsj2jhV3zacJS8CNl4sr7OU="; }; - npmDepsHash = "sha256-3sRjlFuFyG8j8CPKG8Gj5QhE4YD9DJ5qaTJlNJT2Oao="; + npmDepsHash = "sha256-7404OPGhF7bgdvtyfLM/7zRXGUWPr2RLUCzeaHcCj0A="; installPhase = '' runHook preInstall From cd135d423160b1c441688caf60c40344e2625c85 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 3 Aug 2023 17:01:28 +0200 Subject: [PATCH 004/221] qtstyleplugin-kvantum: add suffix to Qt 6 variant Signed-off-by: Sefa Eyeoglu --- .../libraries/qtstyleplugin-kvantum/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index af4f194efc80..15cb346d5b18 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -14,9 +14,11 @@ , wrapQtAppsHook , gitUpdater }: - +let + isQt6 = lib.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation rec { - pname = "qtstyleplugin-kvantum"; + pname = "qtstyleplugin-kvantum${lib.optionalString isQt6 "6"}"; version = "1.0.10"; src = fetchFromGitHub { @@ -37,8 +39,8 @@ stdenv.mkDerivation rec { qtsvg libX11 libXext - ] ++ lib.optionals (lib.versionOlder qtbase.version "6") [ qtx11extras kwindowsystem ] - ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; + ] ++ lib.optionals (!isQt6) [ qtx11extras kwindowsystem ] + ++ lib.optional isQt6 qtwayland; sourceRoot = "source/Kvantum"; From 6c462a529845ccdbe690c738c16d620772455a88 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 3 Aug 2023 17:01:56 +0200 Subject: [PATCH 005/221] qtstyleplugin-kvantum: fix loading builtin themes on Qt 6 Signed-off-by: Sefa Eyeoglu --- .../libraries/qtstyleplugin-kvantum/default.nix | 8 ++++++++ pkgs/top-level/qt6-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index 15cb346d5b18..86408fcffacb 100644 --- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -13,6 +13,8 @@ , qttools , wrapQtAppsHook , gitUpdater + +, qt5Kvantum ? null }: let isQt6 = lib.versionAtLeast qtbase.version "6"; @@ -59,6 +61,12 @@ stdenv.mkDerivation rec { --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" ''; + postInstall = lib.optionalString isQt6 '' + # make default Kvantum themes available for Qt 6 apps + mkdir -p "$out/share" + ln -s "${qt5Kvantum}/share/Kvantum" "$out/share/Kvantum" + ''; + passthru.updateScript = gitUpdater { rev-prefix = "V"; }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 4fda684b54d6..83e6ab872e07 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -41,7 +41,9 @@ in qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; - qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { + qt5Kvantum = pkgs.libsForQt5.qtstyleplugin-kvantum; + }; quazip = callPackage ../development/libraries/quazip { }; From 98741b7e3f2ee558ef2a21a60681fa60980e90cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Aug 2023 01:32:49 +0000 Subject: [PATCH 006/221] maui-shell: 0.5.6 -> 0.6.6 --- pkgs/applications/window-managers/maui-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix index e1abf6676b50..0b2c1b0db380 100644 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ b/pkgs/applications/window-managers/maui-shell/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "maui-shell"; - version = "0.5.6"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Nitrux"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lhTtIHE+FUgZFaPYoIRgLPrBUPISeXHCg3rn0FlQg7w="; + sha256 = "sha256-8D3rlYrqLfyDZQFRSaVlxLaEblbv8w787v8Np2aW3yc="; }; nativeBuildInputs = [ From ccffaecb98a626708a15d52d8f108ad75ee8d4bb Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 14 Aug 2023 14:15:44 +0300 Subject: [PATCH 007/221] nuclear: 0.6.27 -> 0.6.30 --- pkgs/applications/audio/nuclear/default.nix | 53 +++++++++++---------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/audio/nuclear/default.nix b/pkgs/applications/audio/nuclear/default.nix index 6fd277a39adb..605596563e0b 100644 --- a/pkgs/applications/audio/nuclear/default.nix +++ b/pkgs/applications/audio/nuclear/default.nix @@ -1,33 +1,38 @@ -{ - appimageTools, - lib, - fetchurl, -}: let +{ appimageTools +, lib +, fetchurl +}: +let pname = "nuclear"; - version = "0.6.27"; + version = "0.6.30"; src = fetchurl { url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; - hash = "sha256-vCtGuId2yMVIQrMZcjN1i2buV4sah2qKupbr4LhqMbA="; + hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; }; - appimageContents = appimageTools.extract {inherit pname version src;}; + appimageContents = appimageTools.extract { inherit pname version src; }; in - appimageTools.wrapType2 { - inherit pname version src; +appimageTools.wrapType2 { + inherit pname version src; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share - meta = with lib; { - description = "Streaming music player that finds free music for you"; - homepage = "https://nuclear.js.org/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [NotAShelf ivar]; - platforms = ["x86_64-linux"]; - }; - } + # unless linked, the binary is placed in $out/bin/nuclear-someVersion + # link it to $out/bin/nuclear + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + ''; + + meta = with lib; { + description = "Streaming music player that finds free music for you"; + homepage = "https://nuclear.js.org/"; + license = licenses.agpl3Plus; + maintainers = [ maintainers.NotAShelf ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "nuclear"; + }; +} From cc4bb239a3188bcb1501c2e282294b97da13546f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 19 Aug 2023 13:09:17 +0100 Subject: [PATCH 008/221] perf: enable `perf stat` evens supported by `libpfm` --- pkgs/os-specific/linux/kernel/perf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 2fc82b2e10be..ad8f2608d936 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -25,6 +25,7 @@ , libbfd_2_38 , libopcodes , libopcodes_2_38 +, libpfm , libtraceevent , openssl , systemtap @@ -125,6 +126,7 @@ stdenv.mkDerivation { ++ lib.optional withGtk gtk2 ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap + ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; env.NIX_CFLAGS_COMPILE = toString [ From 110ebe9382e7a060c99731f863222e79d215faf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Aug 2023 14:37:44 +0000 Subject: [PATCH 009/221] python310Packages.pytorch-lightning: 2.0.6 -> 2.0.7 --- pkgs/development/python-modules/pytorch-lightning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index d4067edd338e..c76b97c2374a 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.6"; + version = "2.0.7"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-/RfHryuIFhLn9SCg6YVn0Ley8ajcIlsDtuKNuhUFm8M="; + hash = "sha256-R1uX5kPRnLWqqpEYbzJp7aOSK6e5mfyQ14CkbBCDszw="; }; preConfigure = '' From 2da03072206223ed6ee968bdd654a4d82da33001 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 21 Aug 2023 07:37:01 +0100 Subject: [PATCH 010/221] buildFHSEnv: fix `NIX_LDFLAGS` propagation to `ld` wrapper Before the change the following command did not work: $ nix develop -i --impure --expr 'with import { system = "i686-linux"; }; (buildFHSUserEnv { name = "t"; targetPkgs = ps: with ps; [ libmpc stdenv.cc ]; }).env' $ ld -lmpc -o a ld: cannot find -lmpc: No such file or directory It is expected to work as `NIX_LDFLAGS` does contain valid values: $ echo $NIX_LDFLAGS -L/usr/lib -L/usr/lib32 Note that for `gcc` it does work: $ printf "int main(){}" | gcc -x c - -lmpc -o a It happens because `HOST` role is enabled for `cc`: $ echo $NIX_CC_WRAPPER_TARGET_HOST_i686_unknown_linux_gnu 1 But not for `BINTOOLS`: $ echo $NIX_BINTOOLS_WRAPPER_TARGET_HOST_i686_unknown_linux_gnu The change adds BINTOOLS role and fixes linking: $ nix develop -i --impure --expr 'with import ~/nm { system = "i686-linux"; }; (buildFHSUserEnv { name = "t"; targetPkgs = ps: with ps; [ libmpc stdenv.cc ]; }).env' $ printf "int main(){}" | gcc -x c - -lmpc -o a $ ld -lmpc -o a ld: warning: cannot find entry symbol _start; not setting start address --- pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix | 1 + pkgs/build-support/build-fhsenv-chroot/env.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 3e6fc922906f..2c0c4a3d513a 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -105,6 +105,7 @@ let # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY + export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix index abc9ac4c026f..a1a26472373f 100644 --- a/pkgs/build-support/build-fhsenv-chroot/env.nix +++ b/pkgs/build-support/build-fhsenv-chroot/env.nix @@ -78,6 +78,7 @@ let # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY + export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 export NIX_CFLAGS_COMPILE='-idirafter /usr/include' export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' From 55774d1ef67edec9646e2b6f9f5e40df110d2c52 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Wed, 23 Aug 2023 10:20:34 +1000 Subject: [PATCH 011/221] qucs-s: 1.1.0 -> 2.0.0 --- pkgs/applications/science/electronics/qucs-s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 9da94aa609be..0ce67ec4dbb1 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "sha256-cQ9UNCTwRW61dOQYJX0mPNtCTk0qXKx8VQ6BIXl6Fa8="; + sha256 = "sha256-9/1sgxFqn9d9zlwrzjQosFO3m+2lC83qVcCtzfqY5XY="; }; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ra3xdh.github.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mazurel ]; + maintainers = with maintainers; [ mazurel kashw2 ]; platforms = with platforms; linux; }; } From 22f6f9163693eac5c0ceacc2c10d81e62c05accb Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 23 Aug 2023 15:03:17 +0200 Subject: [PATCH 012/221] rpi-imager: 1.7.4 -> 1.7.5 See https://github.com/raspberrypi/rpi-imager/releases/tag/v1.7.5 --- pkgs/tools/misc/rpi-imager/default.nix | 43 +++++++++++-------- .../tools/misc/rpi-imager/lsblkCheckFix.patch | 8 ++-- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index e875d5a59550..7f6b5e79b061 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -1,31 +1,35 @@ -{ mkDerivation, - stdenv, - lib, - fetchFromGitHub, - cmake, - curl, - libarchive, - util-linux, - qtbase, - qtdeclarative, - qtsvg, - qttools, - qtquickcontrols2, - qtgraphicaleffects +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, cmake +, util-linux +, curl +, libarchive +, qtbase +, qtdeclarative +, qtsvg +, qttools +, qtquickcontrols2 +, qtgraphicaleffects }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "rpi-imager"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "raspberrypi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahETmUhlPZ3jpxmzDK5pS6yLc6UxCJFOtWolAtSrDVQ="; + sha256 = "sha256-yB+H1zWL40KzxOrBuvg7nBC3zmWilsOgOW7ndiDWuDA="; }; - nativeBuildInputs = [ cmake util-linux ]; + nativeBuildInputs = [ + cmake + util-linux + wrapQtAppsHook + ]; buildInputs = [ curl @@ -47,7 +51,8 @@ mkDerivation rec { meta = with lib; { description = "Raspberry Pi Imaging Utility"; - homepage = "https://www.raspberrypi.org/software/"; + homepage = "https://www.raspberrypi.com/software/"; + changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${version}"; downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; maintainers = with maintainers; [ ymarkus ]; diff --git a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch index 98fd2a659dc8..aa4fdeecfdb0 100644 --- a/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch +++ b/pkgs/tools/misc/rpi-imager/lsblkCheckFix.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d7fc79..8ce72b9 100644 +index 170ce7a..063a137 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -229,11 +229,6 @@ else() +@@ -332,11 +332,6 @@ else() if (NOT LSBLK) message(FATAL_ERROR "Unable to locate lsblk (used for disk enumeration)") endif() - -- execute_process(COMMAND "${LSBLK}" "--json" RESULT_VARIABLE ret) +- execute_process(COMMAND "${LSBLK}" "--json" OUTPUT_QUIET RESULT_VARIABLE ret) - if (ret EQUAL "1") - message(FATAL_ERROR "util-linux package too old. lsblk does not support --json (used for disk enumeration)") - endif() endif() - + configure_file( From 8fe2040190e56e2d5763dd147cb59cea4c7f56aa Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 23 Aug 2023 15:03:48 +0200 Subject: [PATCH 013/221] rpi-imager: add anthonyroussel to maintainers --- pkgs/tools/misc/rpi-imager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index 7f6b5e79b061..70618276183b 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${version}"; downloadPage = "https://github.com/raspberrypi/rpi-imager/"; license = licenses.asl20; - maintainers = with maintainers; [ ymarkus ]; + maintainers = with maintainers; [ ymarkus anthonyroussel ]; platforms = platforms.all; # does not build on darwin broken = stdenv.isDarwin; From 6db520b15db3c8649fcf9c78611350afd257afa0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 23 Aug 2023 15:04:18 +0200 Subject: [PATCH 014/221] rpi-imager: add passthru.updateScript --- pkgs/tools/misc/rpi-imager/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index 70618276183b..af921b6b789a 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -12,6 +12,7 @@ , qttools , qtquickcontrols2 , qtgraphicaleffects +, nix-update-script }: stdenv.mkDerivation rec { @@ -49,6 +50,10 @@ stdenv.mkDerivation rec { This patch removes the check. */ patches = [ ./lsblkCheckFix.patch ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Raspberry Pi Imaging Utility"; homepage = "https://www.raspberrypi.com/software/"; From 996dbb160b80dadaf647bc5cf008c504ef5da939 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 23 Aug 2023 15:12:22 +0200 Subject: [PATCH 015/221] rpi-imager: add installCheck --- pkgs/tools/misc/rpi-imager/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index af921b6b789a..d62c88716905 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -50,6 +50,18 @@ stdenv.mkDerivation rec { This patch removes the check. */ patches = [ ./lsblkCheckFix.patch ]; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + # Without this, the tests fail because they cannot create the QT Window + export QT_QPA_PLATFORM=offscreen + $out/bin/rpi-imager --version + + runHook postInstallCheck + ''; + passthru = { updateScript = nix-update-script { }; }; From 4fce50f63b7af54c42cab0993e084c32cac0b892 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 23 Aug 2023 20:24:23 +0200 Subject: [PATCH 016/221] rpi-imager: disable telemetry by default --- pkgs/tools/misc/rpi-imager/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/rpi-imager/default.nix b/pkgs/tools/misc/rpi-imager/default.nix index d62c88716905..61ca001563f5 100644 --- a/pkgs/tools/misc/rpi-imager/default.nix +++ b/pkgs/tools/misc/rpi-imager/default.nix @@ -13,6 +13,7 @@ , qtquickcontrols2 , qtgraphicaleffects , nix-update-script +, enableTelemetry ? false }: stdenv.mkDerivation rec { @@ -32,6 +33,12 @@ stdenv.mkDerivation rec { wrapQtAppsHook ]; + # Disable telemetry and update check. + cmakeFlags = lib.optionals (!enableTelemetry) [ + "-DENABLE_CHECK_VERSION=OFF" + "-DENABLE_TELEMETRY=OFF" + ]; + buildInputs = [ curl libarchive From c7bb136ae8fd0514a1fbeb15457d48aa13325b45 Mon Sep 17 00:00:00 2001 From: QJoly Date: Thu, 24 Aug 2023 09:13:14 +0200 Subject: [PATCH 017/221] kubefirst: 2.2.7 -> 2.2.9 --- pkgs/applications/networking/cluster/kubefirst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 6eae71afe124..04930b997e19 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.2.7"; + version = "2.2.9"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-sIX+B08JNwWr4QsWWi4kpqaY9uZbIeiM2sVvMCvSb0I="; + hash = "sha256-QxIbBxNTVONf4x06nuYhY38+pYDwsT3C6yToq7/dHIk="; }; vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0="; From fc770285db32dbbfa0f37a34176f57ec0da4db2d Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 24 Aug 2023 11:50:56 -0700 Subject: [PATCH 018/221] python310Packages.libtmux: 0.22.1 -> 0.23.0post0 --- .../development/python-modules/libtmux/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 9382ccd36b63..ac07b77bf2b4 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , buildPythonPackage , poetry-core , pytest-rerunfailures @@ -13,25 +12,16 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.22.1"; + version = "0.23.0post0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-tz7Pynm/xHx2X3QjXkvFlX6sVlsVKqrsS1CVmqlqfj0="; + hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo="; }; - patches = [ - # https://github.com/tmux-python/libtmux/pull/493 - (fetchpatch { - name = "remove-setuptools.patch"; - url = "https://github.com/tmux-python/libtmux/commit/aa3a1e2015ade73129191ad04146ce52765d478c.patch"; - hash = "sha256-p3KMktd6eG9/lRK+DdBvDtSwhI+sV2RQfBAuElMk8tQ="; - }) - ]; - postPatch = '' sed -i '/addopts/d' setup.cfg ''; From 446297f8678e5372e81923ec8bcc28de1ddbdefb Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 25 Aug 2023 15:38:33 +0800 Subject: [PATCH 019/221] python310Packages.unstructured: add optional-dependencies --- pkgs/development/python-modules/unstructured/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 02b060c790f4..951aec2cd879 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -133,6 +133,8 @@ buildPythonPackage { grpcio ]; + passthru.optional-dependencies = optional-dependencies; + meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; homepage = "https://github.com/Unstructured-IO/unstructured"; From d07ebffdef610aa571bf226b5fbe52a05d934103 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Fri, 25 Aug 2023 06:17:40 -0600 Subject: [PATCH 020/221] yash: 2.54 -> 2.55 --- pkgs/shells/yash/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/yash/default.nix b/pkgs/shells/yash/default.nix index 6af39debf565..b30f03b7e663 100644 --- a/pkgs/shells/yash/default.nix +++ b/pkgs/shells/yash/default.nix @@ -1,16 +1,19 @@ -{ stdenv, lib, fetchurl, gettext, ncurses }: +{ stdenv, lib, fetchFromGitHub, gettext, ncurses, asciidoc }: stdenv.mkDerivation rec { pname = "yash"; - version = "2.54"; + version = "2.55"; - src = fetchurl { - url = "https://osdn.net/dl/yash/yash-${version}.tar.xz"; - hash = "sha256-RKCsHM98Os7PvqAn2MDJMPE6goBlvjGAVc4RMBU5GDk="; + src = fetchFromGitHub { + owner = "magicant"; + repo = pname; + rev = version; + hash = "sha256-raTIqklo69JEuhzdWUK3uywuLjqeQJCJ9nvnLRxlGr4="; }; strictDeps = true; - buildInputs = [ gettext ncurses ]; + nativeBuildInputs = [ asciidoc gettext ]; + buildInputs = [ ncurses ]; meta = with lib; { homepage = "https://yash.osdn.jp/index.html.en"; From 6e7daaa64130ce302798dea8587f19a7ca9f9204 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 27 Aug 2023 22:30:31 -0400 Subject: [PATCH 021/221] risor: 0.15.0 -> 0.17.0 Diff: https://github.com/risor-io/risor/compare/v0.15.0...v0.17.0 Changelog: https://github.com/risor-io/risor/releases/tag/v0.17.0 --- pkgs/development/interpreters/risor/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix index f5e44792627c..149d386fff39 100644 --- a/pkgs/development/interpreters/risor/default.nix +++ b/pkgs/development/interpreters/risor/default.nix @@ -7,18 +7,21 @@ buildGoModule rec { pname = "risor"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-aBUM/+mAuQ+JUOqeMtRYpOwdKbD6An9/Nc2Q6YDnUmE="; + hash = "sha256-/7jUz2180m+YVyE9z4UKOhVv0DSqrCWdkyAftluMHeo="; }; - sourceRoot = "${src.name}/cmd/risor"; + proxyVendor = true; + vendorHash = "sha256-OUQY5yzsbMS81gRb1mIvkRHal4mvOE2Na2HAsqkeWG4="; - vendorHash = "sha256-vlrYmY70nEAI8FSsMzZtuLMt8+aVi0jDX7PGKRMw4r8="; + subPackages = [ + "cmd/risor" + ]; ldflags = [ "-s" @@ -41,3 +44,4 @@ buildGoModule rec { maintainers = with maintainers; [ figsoda ]; }; } + From 3f68347f93dfce83e475942af2983316e8a426ec Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 27 Aug 2023 23:00:23 -0400 Subject: [PATCH 022/221] faketty: 1.0.12 -> 1.0.13 Diff: https://diff.rs/faketty/1.0.12/1.0.13 Changelog: https://github.com/dtolnay/faketty/releases/tag/1.0.13 --- pkgs/tools/misc/faketty/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 2c25dc6b6a2b..6ec144d5d693 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.12"; + version = "1.0.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1q1TOwKC2Tse/Ct/6Nw7YiOviJyBZAsOBEp3sT4N0ss="; + hash = "sha256-jV5b6mB81Nz0Q+Toj5DTQq2QcM+EoQ7jRYV/OXgtemA="; }; - cargoSha256 = "sha256-x8+7sZJnA+kEwKAu8DBF8z7JhWjJ6ZFiLaQP8kFOt08="; + cargoHash = "sha256-9t1Km/ZXzxyO72CaWM81fWGcFkri7F+wMAVom0GV/YM="; postPatch = '' patchShebangs tests/test.sh @@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A wrapper to execute a command in a pty, even if redirecting the output"; homepage = "https://github.com/dtolnay/faketty"; + changelog = "https://github.com/dtolnay/faketty/releases/tag/${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; }; From be3cdca0ec19bf7fbb186bd951fba08d81aca324 Mon Sep 17 00:00:00 2001 From: zaldnoay Date: Mon, 28 Aug 2023 14:00:12 +0800 Subject: [PATCH 023/221] maintainers: add zaldnoay --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98670fbe7b1b..4766639b1405 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18885,6 +18885,12 @@ githubId = 1319905; name = "Uma Zalakain"; }; + zaldnoay = { + email = "zunway@outlook.com"; + github = "zaldnoay"; + githubId = 5986078; + name = "Zunway Liang"; + }; zanculmarktum = { name = "Azure Zanculmarktum"; email = "zanculmarktum@gmail.com"; From 128321bca98a63ad89fa1080416f3dc5d37fbae4 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 28 Aug 2023 16:45:49 +0800 Subject: [PATCH 024/221] unstructured-api: init at 0.0.39 --- pkgs/servers/unstructured-api/default.nix | 68 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/servers/unstructured-api/default.nix diff --git a/pkgs/servers/unstructured-api/default.nix b/pkgs/servers/unstructured-api/default.nix new file mode 100644 index 000000000000..521ff17e573f --- /dev/null +++ b/pkgs/servers/unstructured-api/default.nix @@ -0,0 +1,68 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + python3, + makeWrapper, + nix-update-script, + symlinkJoin, + nltk-data, +}: +let + pythonEnv = python3.withPackages (packages: with packages; [ + unstructured-api-tools + unstructured + pydantic + click + ratelimit + requests + pypdf + pycryptodome + safetensors + uvicorn + ] ++ packages.unstructured.optional-dependencies.local-inference); + version = "0.0.39"; + unstructured_api_nltk_data = symlinkJoin { + name = "unstructured_api_nltk_data"; + + paths = [ nltk-data.punkt nltk-data.averaged_perceptron_tagger ]; + }; +in stdenvNoCC.mkDerivation { + pname = "unstructured-api"; + inherit version; + + src = fetchFromGitHub { + owner = "Unstructured-IO"; + repo = "unstructured-api"; + rev = version; + hash = "sha256-fk0YkGllggi0eWdp9ytHy4/9rChkcDnQvEvVAp1+RJw="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out $out/bin $out/lib + cp -r . $out/lib + + makeWrapper ${pythonEnv}/bin/uvicorn $out/bin/unstructured-api \ + --set NLTK_DATA ${unstructured_api_nltk_data} \ + --prefix PYTHONPATH : $out/lib \ + --add-flags "prepline_general.api.app:app" + + runHook postInstall + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "open-source toolkit designed to make it easy to prepare unstructured data like PDFs, HTML and Word Documents for downstream data science tasks"; + homepage = "https://github.com/Unstructured-IO/unstructured-api"; + changelog = "https://github.com/Unstructured-IO/unstructured-api/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e00fbc33de82..a84f95f282a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27486,6 +27486,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa WebKit; }; + unstructured-api = callPackage ../servers/unstructured-api { }; + urserver = callPackage ../servers/urserver { }; uxplay = callPackage ../servers/uxplay { }; From e8efc18c45ea7fbab70c22c9988f14d2bef39103 Mon Sep 17 00:00:00 2001 From: Janik H Date: Mon, 28 Aug 2023 14:48:51 +0200 Subject: [PATCH 025/221] containerlab: 0.44.2 -> 0.44.3 Diff: https://github.com/srl-labs/containerlab/compare/v0.44.2...v0.44.3 Changelog: https://github.com/srl-labs/containerlab/releases/tag/v0.44.3 --- pkgs/tools/networking/containerlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 51879351fd81..ca9b54c5135a 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "containerlab"; - version = "0.44.2"; + version = "0.44.3"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; rev = "v${version}"; - hash = "sha256-W05FPyBAKnndrELXytrXzpfTcEtq3Q2RDvOQkKMpvwI="; + hash = "sha256-USQULAT1T40eyQHpU3YIdwl2PDG1IHm9ferXKsNVyLg="; }; nativeBuildInputs = [ installShellFiles ]; From efc89b5ef0bf17b8ff3ff566491fe65c6f792e98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Aug 2023 09:00:26 +0200 Subject: [PATCH 026/221] ngtcp2-gnutls: 0.13.1 -> 0.18.0 knot-dns 3.3.0 needs >= 0.17.0 and prefers this newer one. https://github.com/ngtcp2/ngtcp2/releases > Release Candidate (RC) 2 for v1.0.0 I'm really hoping that API of ngtcp2 will stabilize very soon. --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index f19672e566d1..05341188be6c 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.13.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-bkTbnf7vyTxA623JVGUgrwAuXK7d8kzijOK1F4Sh4yY="; + hash = "sha256-FkiqQZ6xmwU2vkJxmr7k+Va5jIByWayAfUea+2DCFhk="; }; outputs = [ "out" "dev" ]; From a144137fa83c00a547a683f0a04c6135dbf4b404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 28 Aug 2023 15:04:07 +0200 Subject: [PATCH 027/221] knot-dns: 3.2.9 -> 3.3.0 https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.3.0 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 492ab6131621..dbe0840a0fad 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.9"; + version = "3.3.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "bc1f9eb8c9f67f52805f3acfa2d0153190245fa145b007fafa9068d2da292506"; + sha256 = "cf12ab736c512eb719a221cd3f65bb94f93ff2b477803d9474d1334af73c1533"; }; outputs = [ "bin" "out" "dev" ]; From 7ce1c176d073c81ffff1c3eac6c1976d0764fa18 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 28 Aug 2023 09:51:28 -0400 Subject: [PATCH 028/221] hoard: 1.3.1 -> 1.4.2 Diff: https://github.com/Hyde46/hoard/compare/v1.3.1...v1.4.2 --- pkgs/tools/misc/hoard/default.nix | 28 ++++++++++++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/hoard/default.nix b/pkgs/tools/misc/hoard/default.nix index f44787924d94..4bdf7b7127b8 100644 --- a/pkgs/tools/misc/hoard/default.nix +++ b/pkgs/tools/misc/hoard/default.nix @@ -1,27 +1,39 @@ -{ lib, rustPlatform, fetchFromGitHub, ncurses, openssl, pkg-config, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "hoard"; - version = "1.3.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Hyde46"; - repo = pname; + repo = "hoard"; rev = "v${version}"; - sha256 = "sha256-Gm3X6/g5JQJEl7wRvWcO4j5XpROhtfRJ72LNaUeZRGc="; + hash = "sha256-c9iSbxkHwLOeATkO7kzTyLD0VAwZUzCvw5c4FyuR5/E="; }; - buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin Security; + cargoHash = "sha256-4EeeD1ySR4M1i2aaKJP/BNSn+t1l8ingiv2ZImFFn1A="; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-ZNhUqnsme1rczl3FdFBGGs+vBDFcFEELkPp0/udTfR4="; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "CLI command organizer written in rust"; homepage = "https://github.com/hyde46/hoard"; + changelog = "https://github.com/Hyde46/hoard/blob/${src.rev}/CHANGES.md"; license = licenses.mit; - maintainers = with maintainers; [ builditluc ]; + maintainers = with maintainers; [ builditluc figsoda ]; + mainProgram = "hoard"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63f600f3dd6b..a34102a18421 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26603,7 +26603,7 @@ with pkgs; hiraeth = callPackage ../servers/hiraeth { }; - hoard = callPackage ../tools/misc/hoard { inherit (darwin) Security; }; + hoard = callPackage ../tools/misc/hoard { }; home-assistant = callPackage ../servers/home-assistant { }; From 5ae06f97c70205121c2854b4ad92a0c7e21aaf15 Mon Sep 17 00:00:00 2001 From: Janik H Date: Fri, 25 Aug 2023 23:39:04 +0200 Subject: [PATCH 029/221] neosay: init at 1.0.0 --- .../instant-messengers/neosay/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/neosay/default.nix diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix new file mode 100644 index 000000000000..4d9b70dd1e2e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "neosay"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "donuts-are-good"; + repo = "neosay"; + rev = "v${version}"; + hash = "sha256-Uwz6Y26AtzWXLFgJY0WVD0HBb+vbMeeMKt8gCk6viec="; + }; + + vendorHash = "sha256-w0aZnel5Obq73UXcG9wmO9t/7qQTE8ru656u349cvzQ="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Pipe stdin to matrix"; + homepage = "https://github.com/donuts-are-good/neosay"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbe71ef27f43..cff3ad997fdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33681,6 +33681,8 @@ with pkgs; neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; + neosay = callPackage ../applications/networking/instant-messengers/neosay { }; + natron = libsForQt5.callPackage ../applications/video/natron { }; natural-docs = callPackage ../applications/misc/natural-docs { }; From 553f5ac2c8a52e98767847cccc70f9bd2d2b214c Mon Sep 17 00:00:00 2001 From: zaldnoay Date: Mon, 28 Aug 2023 22:58:54 +0800 Subject: [PATCH 030/221] bililiverecorder: init at 2.6.3 --- pkgs/servers/bililiverecorder/default.nix | 51 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/servers/bililiverecorder/default.nix diff --git a/pkgs/servers/bililiverecorder/default.nix b/pkgs/servers/bililiverecorder/default.nix new file mode 100644 index 000000000000..d5094bfb1a6a --- /dev/null +++ b/pkgs/servers/bililiverecorder/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchzip +, makeWrapper +, dotnetCorePackages +}: + +let + pname = "bililiverecorder"; + + dotnet = with dotnetCorePackages; combinePackages [ + runtime_6_0 + aspnetcore_6_0 + ]; + + version = "2.6.3"; + hash = "sha256-h7nsbi831HB1tmo7d9vlR8fSKeTn2Ezn8NVl02Z1oQ0="; + +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchzip { + url = "https://github.com/BililiveRecorder/BililiveRecorder/releases/download/v${version}/BililiveRecorder-CLI-any.zip"; + stripRoot = false; + inherit hash; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version}/. + + makeWrapper "${dotnet}/bin/dotnet" $out/bin/BililiveRecorder \ + --add-flags "$out/share/${pname}-${version}/BililiveRecorder.Cli.dll" + + runHook postInstall + ''; + + meta = with lib; { + description = "A convenient free open source bilibili live recording tool"; + homepage = "https://rec.danmuji.org/"; + changelog = "https://github.com/BililiveRecorder/BililiveRecorder/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ zaldnoay ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de1abd04295b..b149776df20a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -348,6 +348,8 @@ with pkgs; bibtex-tidy = callPackage ../tools/typesetting/bibtex-tidy { }; + bililiverecorder = callPackage ../servers/bililiverecorder { }; + binbloom = callPackage ../tools/security/binbloom { }; bingo = callPackage ../development/tools/bingo { }; From c4484420e3da01b758827b2367185b195bbc8ad2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 28 Aug 2023 16:06:13 -0400 Subject: [PATCH 031/221] teehee: init at 0.2.8 https://github.com/Gskartwii/teehee --- pkgs/applications/editors/teehee/default.nix | 27 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/editors/teehee/default.nix diff --git a/pkgs/applications/editors/teehee/default.nix b/pkgs/applications/editors/teehee/default.nix new file mode 100644 index 000000000000..271609c4464a --- /dev/null +++ b/pkgs/applications/editors/teehee/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "teehee"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "Gskartwii"; + repo = "teehee"; + rev = "v${version}"; + hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI="; + }; + + cargoHash = "sha256-hEc7MaqTXMrKiosYacPw/b1ANnfZKdlhThOp2h14fg4="; + + meta = with lib; { + description = "A modal terminal hex editor"; + homepage = "https://github.com/Gskartwii/teehee"; + changelog = "https://github.com/Gskartwii/teehee/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "teehee"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 578799196242..c0eb55d45992 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13670,6 +13670,8 @@ with pkgs; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teehee = callPackage ../applications/editors/teehee { }; + teip = callPackage ../tools/text/teip { }; telegraf = callPackage ../servers/monitoring/telegraf { }; From 4a142365387568f12f331af895c53d0e7b18cd13 Mon Sep 17 00:00:00 2001 From: Babeuh Date: Tue, 29 Aug 2023 02:00:28 +0200 Subject: [PATCH 032/221] multiviewer-for-f1: 1.26.2 -> 1.26.4 --- pkgs/applications/video/multiviewer-for-f1/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix index 7a51720ec5d8..5dd929fcbaa5 100644 --- a/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -23,15 +23,15 @@ , xorg }: let - id = "123219506"; + id = "123365359"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.26.2"; + version = "1.26.4"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-nibPVqc4B3PHF/3wR5FsYZGVkkReQjy+4glfdnBysSU="; + sha256 = "sha256-VKpEE1o24Wc4IOagIC62kzPf7nCkgAWsXbeOQXNN4O4="; }; nativeBuildInputs = [ From 1a4c043d7cbae7ac213bd99804f9d1e987b079ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 04:02:17 +0000 Subject: [PATCH 033/221] python310Packages.pytile: 2023.04.0 -> 2023.08.0 --- pkgs/development/python-modules/pytile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 977cf15d074b..12d61c0da5eb 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytile"; - version = "2023.04.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - hash = "sha256-SFHWhXKC7PIqanJIQyGcpM8klwxOAJPVtzk9w0i2YYA="; + rev = "refs/tags/${version}"; + hash = "sha256-wPtGofli3ZKBcAwjwjCbeYnLaSZ5lLshlBSz1/WlAcg="; }; patches = [ From f4d322550704180df3c43dd68c0c3970de12556f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 05:11:10 +0000 Subject: [PATCH 034/221] python310Packages.aioridwell: 2023.07.0 -> 2023.08.0 --- pkgs/development/python-modules/aioridwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 1ef9300eaf35..150486cf4aea 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.07.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8EPELXxSq+B9o9eMFeM5ZPVYTa1+kT/S6cO7hKtD18s="; + hash = "sha256-AreQC5LOthnOEj0HnEww4zLob394XwCvqZBwjsT2Lcg="; }; patches = [ From 4088fb345e4b2300e3424e58217fbe7b687e4c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 18 Aug 2023 19:07:44 -0700 Subject: [PATCH 035/221] node-glob: use buildNpmPackage --- pkgs/data/fonts/openmoji/default.nix | 3 +- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 65 ------------------- pkgs/tools/misc/node-glob/default.nix | 29 +++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 34 insertions(+), 67 deletions(-) create mode 100644 pkgs/tools/misc/node-glob/default.nix diff --git a/pkgs/data/fonts/openmoji/default.nix b/pkgs/data/fonts/openmoji/default.nix index c9722f60f204..fd0d8882059c 100644 --- a/pkgs/data/fonts/openmoji/default.nix +++ b/pkgs/data/fonts/openmoji/default.nix @@ -4,6 +4,7 @@ , fetchpatch , scfbuild , fontforge +, node-glob , libuninameslist , nodejs , nodePackages @@ -59,7 +60,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ scfbuild-with-fontforge-20201107 nodejs - nodePackages.glob + node-glob nodePackages.lodash ]; diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index e3ff0d15396a..7d06f7f1a410 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -65,6 +65,7 @@ mapAliases { inherit (pkgs) firebase-tools; # added 2023-08-18 flood = pkgs.flood; # Added 2023-07-25 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 inherit (pkgs) htmlhint; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c715380e4f2a..4d5fdce9b846 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -134,7 +134,6 @@ , "git-standup" , "@gitbeaker/cli" , "gitmoji-cli" -, "glob" , "gramma" , "grammarly-languageserver" , "graphql" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 845812fdad5e..d703744c03a7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -88724,71 +88724,6 @@ in bypassCache = true; reconstructLock = true; }; - glob = nodeEnv.buildNodePackage { - name = "glob"; - packageName = "glob"; - version = "10.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; - sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; - }; - dependencies = [ - sources."@isaacs/cliui-8.0.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-6.2.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."cross-spawn-7.0.3" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."foreground-child-3.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."isexe-2.0.0" - sources."jackspeak-2.3.0" - sources."lru-cache-10.0.1" - sources."minimatch-9.0.3" - sources."minipass-7.0.3" - sources."path-key-3.1.1" - sources."path-scurry-1.10.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-4.1.0" - sources."string-width-5.1.2" - (sources."string-width-cjs-4.2.3" // { - dependencies = [ - sources."emoji-regex-8.0.0" - sources."strip-ansi-6.0.1" - ]; - }) - (sources."strip-ansi-7.1.0" // { - dependencies = [ - sources."ansi-regex-6.0.1" - ]; - }) - sources."strip-ansi-cjs-6.0.1" - sources."which-2.0.2" - sources."wrap-ansi-8.1.0" - (sources."wrap-ansi-cjs-7.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."emoji-regex-8.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "the most correct and second fastest glob implementation in JavaScript"; - homepage = "https://github.com/isaacs/node-glob#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gramma = nodeEnv.buildNodePackage { name = "gramma"; packageName = "gramma"; diff --git a/pkgs/tools/misc/node-glob/default.nix b/pkgs/tools/misc/node-glob/default.nix new file mode 100644 index 000000000000..aba4690bbba4 --- /dev/null +++ b/pkgs/tools/misc/node-glob/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "glob"; + version = "10.3.3"; + + src = fetchFromGitHub { + owner = "isaacs"; + repo = "node-glob"; + rev = "v${version}"; + hash = "sha256-oLlNhQOnu/hlKjNWa5vjqslz1EarZJOpUEXUB+vGQvc="; + }; + + npmDepsHash = "sha256-78oODw+CBCk5JRJbDqLqVmzTVImP7Z7o6jRIimDxZDQ="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/isaacs/node-glob/blob/${src.rev}/changelog.md"; + description = "A little globber for Node.js"; + homepage = "https://github.com/isaacs/node-glob"; + license = lib.licenses.isc; + mainProgram = "glob"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 292624c41fd3..77da2d43f867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1890,6 +1890,8 @@ with pkgs; systemd = pkgs.systemd; }; + node-glob = callPackage ../tools/misc/node-glob { }; + nominatim = callPackage ../servers/nominatim { }; ntpd-rs = callPackage ../tools/networking/ntpd-rs { }; From 46c7997f40ea824c0992fbf9453dde7c5525bbef Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Tue, 29 Aug 2023 02:59:33 +0100 Subject: [PATCH 036/221] ispc: 1.20.0 -> 1.21.0 --- pkgs/development/compilers/ispc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 4137847f47db..606d77c1737f 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256:06wgvfbc6nh5c7yili47h2gzl0ykcwnvyizy499kb6gsplflf9gh"; + sha256 = "sha256:029rlkh7vh8hxg8ygpspxb9hvw5q97m460zbxwb7xnx1jnq8msh4"; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; license = licenses.bsd3; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; # TODO: buildable on more platforms? - maintainers = with maintainers; [ aristid thoughtpolice athas ]; + maintainers = with maintainers; [ aristid thoughtpolice athas alexfmpe ]; }; } From 617d8550e919bbb1ea92d46afa9f7b50f659ed43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 17:04:36 +0000 Subject: [PATCH 037/221] coconut: 2.2.0 -> 3.0.3 --- pkgs/development/python-modules/coconut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 06fe43806354..07e070d0493e 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "coconut"; - version = "2.2.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - hash = "sha256-+OrVNtre7kAfU5L7/6DadZxFNWVt5raF6HLGXHHpOvE="; + hash = "sha256-u1tcIu0U1VZrUx2hVdtRDv1N4jVf176kQSw47/7lOXY="; }; propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; From 6650ef5f6b35bb3215665216eaaba60d62f70ce9 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Tue, 29 Aug 2023 19:14:35 +0200 Subject: [PATCH 038/221] dasel: 2.3.4 -> 2.3.5 --- pkgs/applications/misc/dasel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 7dfe56f54483..c01cc4d67c0f 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-/1CTtRTLgMlmFeubq3ebGnA9Do1mW6TtAXsCwi1JFmk="; + sha256 = "sha256-O2v4VsrE4DyGJQN7ggaqMkZxFstDrhyQCFaEdrB3sTY="; }; - vendorHash = "sha256-cLf0MzEAykmtnPjT2vGOSPwIXJP6BhxheUaicT7o/X4="; + vendorHash = "sha256-Gueo8aZS5N1rLqZweXjXv7BLrtShxGDSGfbkYXhy4DQ="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" From 71f65ac99af02bc3d8de4f09bbfb6e9b557c7196 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 29 Aug 2023 10:39:27 -0700 Subject: [PATCH 039/221] tmuxp: 1.28.1 -> 1.29.0 --- pkgs/tools/misc/tmuxp/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 2b153d230f28..cd80aa3495cb 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,18 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.28.1"; + version = "1.29.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sNLqUyas6QY11eW/FhkqB6+u4MTqiY1ixvD3BN69Fic="; + hash = "sha256-MiXG4MVzomyc4LjovPsvhmPngtJv85s6Ypo/Cm2Whho="; }; - # No tests in archive - doCheck = false; - - format = "pyproject"; - nativeBuildInputs = [ python3Packages.poetry-core python3Packages.shtab @@ -27,6 +23,9 @@ python3Packages.buildPythonApplication rec { libtmux ]; + # No tests in archive + doCheck = false; + postInstall = '' installShellCompletion --cmd tmuxp \ --bash <(shtab --shell=bash -u tmuxp.cli.create_parser) \ From 18fe320058a7ae3e4ca71762e09ccee50239740a Mon Sep 17 00:00:00 2001 From: Kiran Ostrolenk Date: Tue, 29 Aug 2023 20:57:38 +0100 Subject: [PATCH 040/221] maintainers: update CardboardTurkey's email and key --- maintainers/maintainer-list.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e2f4a9f6494..bd17587a854b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2732,9 +2732,12 @@ }; CardboardTurkey = { name = "Kiran Ostrolenk"; - email = "kostrolenk@gmail.com"; + email = "kiran@ostrolenk.co.uk"; github = "CardboardTurkey"; githubId = 34030186; + keys = [{ + fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; + }]; }; carlosdagos = { email = "m@cdagostino.io"; From 53fff964c43094893b1e6449a08e3d68067570b3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 29 Aug 2023 18:16:04 -0400 Subject: [PATCH 041/221] gradescope-submit: init at 2.0.2 https://github.com/nmittu/gradescope-submit --- pkgs/tools/misc/gradescope-submit/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/gradescope-submit/default.nix diff --git a/pkgs/tools/misc/gradescope-submit/default.nix b/pkgs/tools/misc/gradescope-submit/default.nix new file mode 100644 index 000000000000..89e7dc89438c --- /dev/null +++ b/pkgs/tools/misc/gradescope-submit/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, ocamlPackages +}: + +ocamlPackages.buildDunePackage rec { + pname = "gradescope_submit"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "nmittu"; + repo = "gradescope-submit"; + rev = version; + hash = "sha256-BVNXipgw0wz3PRGYvur8jrXZw/6i0fZ+MOZHzXzlFOk="; + }; + + buildInputs = with ocamlPackages; [ + core + core_unix + cohttp + cohttp-lwt-unix + lambdasoup + toml + yojson + lwt_ssl + ]; + + meta = with lib; { + description = "A small script to submit to Gradescope via GitHub"; + homepage = "https://github.com/nmittu/gradescope-submit"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "submit"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5575dccdfa4..ceebbc3da5f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -688,6 +688,8 @@ with pkgs; gpick = callPackage ../tools/misc/gpick { }; + gradescope-submit = callPackage ../tools/misc/gradescope-submit { }; + gridlock = callPackage ../tools/nix/gridlock { }; inherit (gridlock) nyarr; From 96694e36c3f4b121c82aae2d871b51dc3d242397 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Aug 2023 23:41:14 +0000 Subject: [PATCH 042/221] iosevka-bin: 26.2.1 -> 26.2.2 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index c09cb562b763..63c7f294d3c2 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "26.2.1"; + version = "26.2.2"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 507f342725b4..8120eda2553b 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "05kmsx5nfllnynq85m4s9smdq0zqxv2gg3k5xd67ba9c0gkyxx17"; - iosevka-aile = "11qbl5np9wf5n5yy2y6vf830bal96a2lkdhd6xv65b1kqsz6n5bp"; - iosevka-curly = "1hdr93lfm8mmm3rr6s13vvacp5h4xqyqkr2a6zl18dgm27rhp7gn"; - iosevka-curly-slab = "0yp06p379n6x9zkh9ljg1n6ia1ydm93cnp5mw8yapnhk604f4cn3"; - iosevka-etoile = "1yn743abmyifci72jsmr71swkqdy35whcs36b0a3ypakm7qlgkl9"; - iosevka-slab = "0d7972ja8flg09q28qh36v4xfavnffn2g4zjkgrzm8pxgz3skzwb"; - iosevka-ss01 = "0ir5dgw8qqzzlihvicmzplvhd4hhlja2986ppyrj8kwkbhjrczry"; - iosevka-ss02 = "0j5vrhd48hrql1jz9bdf1lqzdg7cv4nb7snl82sh4f19h2k2f2a2"; - iosevka-ss03 = "15n5kin4p31czns8l3g29hia17c8x61b55n27qbknfb17yici7g9"; - iosevka-ss04 = "1zaba7z85k75lrh8x46x77c0hp6145dpg1shh05lmgvmgzyx3s02"; - iosevka-ss05 = "1ybwb3k9gj5icc8qngzlwxvk306xssz3ax7nqlgr1kij1wawbcd7"; - iosevka-ss06 = "0d7p2kvpr3x4mlh28y13ph8v7xmziyvrksy7m4zkpll0mkxxrcc1"; - iosevka-ss07 = "1pbvikwa1nrr91aq2an9bav4allxks29ghpss6plm01c2czkjqs3"; - iosevka-ss08 = "1ilmlqbrxaz9rpparyq7lhg4c6i0hmd4az049js7rq7nif071dhb"; - iosevka-ss09 = "0f9fycpsq6fqg7x451bca5cfwwnbswmv39sl2i7ia36kmmlsbarm"; - iosevka-ss10 = "02k9kra2wqjylvblngv1v9qxfw82yhbrk5vx96bfc16jllw6pk69"; - iosevka-ss11 = "135v3i6am7hd4iwpf1yj3jszpfyzv4n900wgiqy46ld4qdlvyj0b"; - iosevka-ss12 = "032slrybd0bdnbsrsz2k7p153dcfi6064zhg292n5fk0whv712vg"; - iosevka-ss13 = "1qm8gk23ix98ciw1xn6kmwq8x3fcrg9yq1rn71v219n0jyria053"; - iosevka-ss14 = "1s34fva3bq0m0chib56bj085rwgm4d21grhnf9ca4af01i91lvdh"; - iosevka-ss15 = "0ikd1lfq8xiyqyppxf8hbvsvqdf0fg2g0056qxqa2w6nvw3f70cf"; - iosevka-ss16 = "0baada586j23mxjl6ail4fdp9p9swrnwi8q5w6gh25kgbr2gf3lp"; - iosevka-ss17 = "143ydszlic3byk5ps4ysaql72d7pmdzlhds9dcpy6bcv2m5b1bc2"; - iosevka-ss18 = "1vrpa1ah718jn5xn72r7j26mka656ik1bb31fah3vlridzkjqyxx"; - sgr-iosevka = "1f2d9d7pyq916frhr5qlzr5hjwjkfpsqcpgp1p0f2g7z4qw8rr2z"; - sgr-iosevka-aile = "01aym5ykddkypafsj2186plfp9qm0nm5lbj5vra6yiwxmac3s0fi"; - sgr-iosevka-curly = "13nklbij304vch9xcqgvcwcdchzrf010iln5022am23ny1ip13aw"; - sgr-iosevka-curly-slab = "0x2n86ysvph7cv2r5m8lm3xwhq4wds2dv2mjcs8nz66n88hvwk8i"; - sgr-iosevka-etoile = "0c3pfgwlj5nw4xpbvigwjx8z47xxkpikzyaq8a8klabymyvjg0nj"; - sgr-iosevka-fixed = "1bvy9dv70ywkdhv6jj12mqbi95ljgr6068dmi31ds5rx7cflfrbq"; - sgr-iosevka-fixed-curly = "0lcizhf935an59hrr71nrk6x0aqy0rw4xcb7n583gm8svkpkhrfc"; - sgr-iosevka-fixed-curly-slab = "0fz6q3wnk0yniyhpsm07z94s61jc46rps4925wg1nxriyl16fd21"; - sgr-iosevka-fixed-slab = "05p989w89arj8fylqdjkby9c7jdadnm6yc8xjjwj81wpmlv5is02"; - sgr-iosevka-fixed-ss01 = "0krq1wamxxcqcfk13fsdi1n2wcxvrx5kcfr95dwmddyhr46f6c8g"; - sgr-iosevka-fixed-ss02 = "0n9pfa8lfisbz0cgrii2d18sq7bfrg4gbmj4d4ncq2zxcq63y52k"; - sgr-iosevka-fixed-ss03 = "0xybkybnmqqjkrapm7sm6nr3n7f68chss1rbxp966l7bnq17zlwn"; - sgr-iosevka-fixed-ss04 = "0hs0jhfnc68xvvzmmhmc32rv4b16qiy21dv0lnrpjwc8hwqww661"; - sgr-iosevka-fixed-ss05 = "1kxcadk3z362paqian2pi9nv64k35xhhqd6jw52837g4gmq2l6cn"; - sgr-iosevka-fixed-ss06 = "0d3lx7s99j5bcdkc4a3w0axv1arlj4xrcfffa3a0z1yvj587c1gs"; - sgr-iosevka-fixed-ss07 = "06cr5h81vzchg2kx980rnw9g8a0iyxs89p15xai1fwjz8v18b6q1"; - sgr-iosevka-fixed-ss08 = "1ygni8kdnr72m4dlm0inj49x00gj6m09569sk7x1v2q840hlbka4"; - sgr-iosevka-fixed-ss09 = "0n96481gn66cs7fy43l172f0f5llysny5a8vn9p1gqr30pkjsb1c"; - sgr-iosevka-fixed-ss10 = "1dd4jwnv8s8h2r4rrsdr3fzhck86rbxz2n3cmqk8ns0ysi81a9j7"; - sgr-iosevka-fixed-ss11 = "0xaxzl5wv37dypp97wvi4pv3dzlln6pw5y7lf9jqyfxlj9nkx14m"; - sgr-iosevka-fixed-ss12 = "1lisn7jrfm444309hbf6cyag54hs7gxbdvcs8z92c3v3xl8382j1"; - sgr-iosevka-fixed-ss13 = "1lvkla942w36plh5bzwi45zw3a8cixa61kyw5q6pj69yybp6hp49"; - sgr-iosevka-fixed-ss14 = "11racg8i508dgap2pq0rvzc20612d7px7yajsqd7y3mlf8311920"; - sgr-iosevka-fixed-ss15 = "0vnhp6rm1gd7g9140lgjbpckl6ysaf4cza2h3p2i1m2mxyq8yfi3"; - sgr-iosevka-fixed-ss16 = "1xkr6afpjqgjj55a8lmzzhfld66iqszh1dig8balg5s95gm6ylnz"; - sgr-iosevka-fixed-ss17 = "06q9w6vx6dhlfnjs9hsa9k8fzd9zb9v65d9jfwfdzp54i2asrac9"; - sgr-iosevka-fixed-ss18 = "13vcnny1a0yikimajqjvc9yadrh2l98qm1bnpmpc9fny158n5nks"; - sgr-iosevka-slab = "15pj76l27g8n93f1bdn5fs3csfhlvcig11hz0x85ffwc8i8dgx60"; - sgr-iosevka-ss01 = "0x09g6hz70jrijw86s4l2cpff8ln5aljs7p8675wjc2a3lwj3d3j"; - sgr-iosevka-ss02 = "10dsvi9k65ijkhrxkm2zwmipsq74yh0wgxham70bc3rb323w5vzq"; - sgr-iosevka-ss03 = "1zccin0dj2w7rykhqb7w30rvi96gp086wln0zd40i10ah8yqw8x7"; - sgr-iosevka-ss04 = "1hky2b7ls5n3pb0jzgrxfsly126f770jysvfkcq37bpb0f14wrhj"; - sgr-iosevka-ss05 = "076v20qzcf063hdnx145iwapn884hwcim5ws0qx9qh7l3im9s5w2"; - sgr-iosevka-ss06 = "1z2qi8crsvxryn3gxn63zw67hm9fz8rygkjypw8nvbz2p64axif5"; - sgr-iosevka-ss07 = "0v2cgifv6ic2cn1c6rd8lsjiz34rmp6n3flwiq38px9pra0yh7rz"; - sgr-iosevka-ss08 = "1s7nhfznyz3hqwjh6xs1bkph9s0g7kwd54h2hx5mkagk0cg2xya6"; - sgr-iosevka-ss09 = "0j3ny30fnbr1vgcfjssln9ry8kpn8yq2nn9gi2x55cxi1gwgnbpl"; - sgr-iosevka-ss10 = "0wksbv2fj4nw452h7d5nw8gq4vwjhxrw4hxr44xrk4skkwwaakzn"; - sgr-iosevka-ss11 = "1azscl182xgfx6993rwwbhxbx4pswwwmwbarxmc775668ydifb73"; - sgr-iosevka-ss12 = "199qf4vmyjql2f1gnqdwsvxgyf8c4nyr5rwyb6d3zwz5kbqdk9cv"; - sgr-iosevka-ss13 = "0n9s94x5j3gkzcgw2w3lqphm487xs8x10nklwlz24wh6mxp6azza"; - sgr-iosevka-ss14 = "0dmnd7cfdxv9hbz3q0bir0csblkzpwfqwcz05y4b79f1fjjahiag"; - sgr-iosevka-ss15 = "036syp2d0w4gy5j7dr813amvaw2b0kr3v6175vv8y9xgy266ldv0"; - sgr-iosevka-ss16 = "1hcalq0bvpzd6jq37pqxqjmnh2wmwvmc54fajl03rkw0spf8c4j1"; - sgr-iosevka-ss17 = "154fg69nadpjd5pmnlxf6bbg86w6zpk1nvm9h604017llgz8iwqa"; - sgr-iosevka-ss18 = "0ywrj6hmhk0hp5kcdy3i6989glbd1g62s8lr2kixbjm4g27d83hd"; - sgr-iosevka-term = "12v6im4q77cs6c2ff0dfsis2zlcphcxwqjsbpvl9x9cziznv7lnv"; - sgr-iosevka-term-curly = "1999vm3y28xm6bcp3s1fksvhs8rggra6i5rfxrsh69fy4i5l7z8q"; - sgr-iosevka-term-curly-slab = "00xjqkilsrykq7my2rh046q1qdcb110dd2lyz0kq40wl1ipxxyy3"; - sgr-iosevka-term-slab = "174kyc58rb5zrrxqhkmn5ili6vlbffa4n8g68faygajmjqajnr52"; - sgr-iosevka-term-ss01 = "01l0siyzrwz56m9w8zxf9n09rv1mh0j4l6jqr6vdzqqvgj6h7k5z"; - sgr-iosevka-term-ss02 = "19rl3pxhs1g2mwfsp64krnfcfkx5x7qfja3fx5h74r1jm3p8insv"; - sgr-iosevka-term-ss03 = "04vzrfbrpb0xssr6y1cyysfra2z3g9hm4jn65rzcavmd3i1azj7d"; - sgr-iosevka-term-ss04 = "08zwnsb1d1x5rmbssyknf1fxcc14bpvcjr6qcl8igpi03bpwag27"; - sgr-iosevka-term-ss05 = "0ichgg8vfifpnd4sjj2f1snphgxk4cqpd7p3w8dbzn1bp7633jna"; - sgr-iosevka-term-ss06 = "1kdrbq0m1bdfbxwqlfnmvi98dzplc27p10jgbh877b300dpzwmap"; - sgr-iosevka-term-ss07 = "099aicmxxa3criq768ycgkcm00b6mssxjavwzc3lkq37vic55y80"; - sgr-iosevka-term-ss08 = "125m0rs16nnvxkldk8vdc7g04lb29ha0a9ip9kway460wvmjqv9x"; - sgr-iosevka-term-ss09 = "12r3dqm4y19fyd8dqxli1y8wg5cs2qmmngqbkwb66kxbx1hhgpbs"; - sgr-iosevka-term-ss10 = "0xyfllwx2m5ngr82wn2fvlbz7kj3qwcnqz43l3cfvafl54zppl4z"; - sgr-iosevka-term-ss11 = "0sa5pp8fz2fb0d4k8rln0d4l0h1mqz6rvhrcfg49ds84g28380ls"; - sgr-iosevka-term-ss12 = "08ni5rgj4gfpmalqblz5ip36a8wffk9b9igaj6grmhc8q16i88sl"; - sgr-iosevka-term-ss13 = "0zmzjzhrk2y18jk3m5pb7f2mz1dr9sdrs0pbw20kfsr70km3mv54"; - sgr-iosevka-term-ss14 = "049yr8s9adawgrqi4z5qy3xz6pbcafvsw9sd6kb0nrgv8w5y6gd1"; - sgr-iosevka-term-ss15 = "1cyzj976697m452ifvr6yh8ng9wzfs38xlqwcmy26kk5n4dm2xy8"; - sgr-iosevka-term-ss16 = "0lg9sz029hw54v6qmbv5z80gxgic6zlva4yb0jpnajn8jj9zcdam"; - sgr-iosevka-term-ss17 = "0lpynm823jrlbs3qvf5apvnzk4h8bc8axqn3cifcd419hq25n55y"; - sgr-iosevka-term-ss18 = "12bx1d9lmdv9ljqqjmkq2rjpl4hh77c616xyjx4x2q79apznf56n"; + iosevka = "14ba5s1x31cypvqlw7qlqpk1sj70sxdj6fkjwbzjmnl1q7j36sja"; + iosevka-aile = "11dd3ihij89fdxpqb0ni40gq43nzrilpw7s3nq7f1ml0dh6a0r7m"; + iosevka-curly = "1ay28cgjhw0fkp76ja5k3mks8cl5wxxzsb505jvjxxn2k48nw1lw"; + iosevka-curly-slab = "0k47hk9xfamrnfaq03is559nlmzk9cdsplm393ldh921ysx1sr69"; + iosevka-etoile = "1big9dlwdc90ld9y0sxvhrxnny8lwgihrijwc7m22js2mlvddgi4"; + iosevka-slab = "00dmnxzwmm30946rlj1gl1zp967srr238kvg1r8krk1xz2a15cqv"; + iosevka-ss01 = "083dbc3g46ivz6ywxcnyqhfr39j3gb7l74brk9afaz9nb83qlkp3"; + iosevka-ss02 = "0xcya6428cdky0gygc5i30yl9jkhw9h66ln7vlnf46jw4pkh4dki"; + iosevka-ss03 = "08fg2wiq1rzn3cz4ihn3i44n3ck5i0azr45bf0gjcisizg1snxma"; + iosevka-ss04 = "042bldpbdhv0rgzpcmsw1q6wqydb01imfwdrvjg4ylpy1vr4aclh"; + iosevka-ss05 = "1fq4drdvzq4avwmndky686x6x6vn4clzvp87mcacvfl4c5ambcvv"; + iosevka-ss06 = "0jpih8gjxhrpr5lhy5q5y51jsmw8n62mmkghaqnn1n4crbsp2adp"; + iosevka-ss07 = "0qv0qflf90acxdqr1ypfah66jijhhbhjj2nn774rys60nfphc0bv"; + iosevka-ss08 = "09hinpg6i5ghqjmvfashih14rfnp3z08v4xyan5wrkh6cyf5nnmk"; + iosevka-ss09 = "0q31af86j6wc9p5dzl76kxwr49xp0pg2a9fk5z6z56yfr8dxrc0c"; + iosevka-ss10 = "0a6wi64vafs2s5cl9px4dvrqwnjjbmw1s57g8w1jgqi7k64iara1"; + iosevka-ss11 = "19rmicj0m4i5vjhi8g4w0n2cxmnl6ssyfivgg77w6h1rx7cyfi62"; + iosevka-ss12 = "1nj3388x6yl15qg8xvzqdcp454j9wwyi3w64yvis7f22bmd288rh"; + iosevka-ss13 = "0rsf55vhkv3vx64sb9riwq711yygwiism2i956xld44x57a80b9h"; + iosevka-ss14 = "0685b5n7jl4ijf2a64v6sbxzmkaqd1rl1m6yl8ls9ppxph3pps5z"; + iosevka-ss15 = "04nbq5hrs6g7br342h4px0g68wrgdi7021znfgbmrj0ic32b3nyn"; + iosevka-ss16 = "0yp4iqz4zy3z5lwv8dfchf8qiykwa3l83dl5ipq7ci1wg3wpfppf"; + iosevka-ss17 = "1iiysz3hppfshm2yjzsfvg8gs79jcnf63lirxi8vca5afl72mhfk"; + iosevka-ss18 = "0c163m25ihan3rv1bvf7js6nhs5v19yrif7rsbjz954izp328j3l"; + sgr-iosevka = "001nm77n3599xn4ns3kaisyf1a4msmhnfcsh37k6bik621k673jl"; + sgr-iosevka-aile = "04qfjvhh5rnqbyclrw62naaw98vl1py77wz5nig7gq8yv1zm1m3x"; + sgr-iosevka-curly = "1gxbckamfyrg5spvj3fd6zrsz12cvfrd9mwr39s4ric23d9qcak5"; + sgr-iosevka-curly-slab = "0hpxia5x6pmvd6sn7ny1wnj8pq07apvaj1767iqgva6gsblf3ddw"; + sgr-iosevka-etoile = "0m4j1pjmzb416kvrzvifzv1h0rcq2pzzhyyzbzamcixkwafqgbqg"; + sgr-iosevka-fixed = "05hpjfb7w5zfdgjrpk243kc8gk7a59smzcrf3lc9sa8j4wf9y4ap"; + sgr-iosevka-fixed-curly = "1i1ihxqh99akjris5kiwspaqjjxbl3h5p4c4kxrd9j9n984q4i5y"; + sgr-iosevka-fixed-curly-slab = "0xmq3gxgv5pn8ys155kk3lwz9vcnbbj7mxhz96cgr2gjgby59b5a"; + sgr-iosevka-fixed-slab = "1pvjvwdapjwrc7vgmvvz0j6cvki1g99qzbw1kgpy9vh6kvl57nm1"; + sgr-iosevka-fixed-ss01 = "10fsl8w9kbb5vy9yj9qzyr5d6bkw1d0sdkbyvwhlynirc1nqfx8k"; + sgr-iosevka-fixed-ss02 = "0f235lz8j1s6xp99cikmf52ji9px0vrryld7qs3gasjjnqkrnl1z"; + sgr-iosevka-fixed-ss03 = "10jmd2xxy6xwkk6ckmn5qa4x0386krvhkpic6yp2bwmh3jrq10qw"; + sgr-iosevka-fixed-ss04 = "1jb6hhrciaxzwcv8n3zfh9s1ars052ssczg94sxyvaddh09qp5y0"; + sgr-iosevka-fixed-ss05 = "1jv2q3wqh7v6b53sf4ra40345i6i6yx9b2qj59jazlvlc0nindnw"; + sgr-iosevka-fixed-ss06 = "1kxnphz60n71l86x200xh6s45xb6fhdawrxvi06r7pnza027ckaj"; + sgr-iosevka-fixed-ss07 = "0asajsgrq5nj0br4d3f814kfm2lfwip33zl2yssm7z99f1kn7dzq"; + sgr-iosevka-fixed-ss08 = "0jclw1cqgxhm32zwv7ybbal7bnlpm1k0v15fz42kvf1abbj2k6mv"; + sgr-iosevka-fixed-ss09 = "0a7nazrysbvf1jyqdlk25wswhzvv8mcakjdgckjlpv65hq1fqdzw"; + sgr-iosevka-fixed-ss10 = "01l07jxhksqyb2wnljnpwpcqxaizcdbzaycq31mkv63aqmcz91vm"; + sgr-iosevka-fixed-ss11 = "1r67pfmirm43mzz9k7asaif15x43iny5qbds0wjx2z12lscpnj16"; + sgr-iosevka-fixed-ss12 = "1g4fk496npcix5q4alw1qcqd0w5iyamlg6vv82nk20axrb05gisv"; + sgr-iosevka-fixed-ss13 = "060pmmzwcfkv517r6jwz5kq0d4b3ha5bzlf4agg8b5d5003didwg"; + sgr-iosevka-fixed-ss14 = "0f1w5hcaw933jb6v4zmgvgan4k02mfhwzvyrgxyaq60f0gl8456d"; + sgr-iosevka-fixed-ss15 = "0isw2xpv8zfp145zlnf2gxbdnc54zyn0s7nvsck2qwh6ah1mqiwy"; + sgr-iosevka-fixed-ss16 = "18cwq0zrq5ih0ijb7bp8f7zvdzg5ni3pmiw18g9p2zkrswyahgnc"; + sgr-iosevka-fixed-ss17 = "0d1jbj65n4wj0d549sramf6d3jgx2hrfac7m00m5rsfrlg3l9xg3"; + sgr-iosevka-fixed-ss18 = "0iv1wwa1333v3prc3ykms6z454ypmasi8n419xl6c71n4f3haf1s"; + sgr-iosevka-slab = "0zfxx0wp00l80skiimlikibsw9iy9lq86s5jhz1dc59g2bldvqdx"; + sgr-iosevka-ss01 = "0k17663haxcnidmi5hkk9w2hmhxjxj89h4cwby1wrc52zlj491cb"; + sgr-iosevka-ss02 = "1aqsi8xa0napzsdvmy39msy8fj4nf5an7bsxwj7dgpm9p0irdncq"; + sgr-iosevka-ss03 = "0zhx2r3f55628brvz973nsikafx23m4mjw5lyzlqgig1d1d2jd58"; + sgr-iosevka-ss04 = "0ls91yih8plwgi9a00iwrxk21y8psjv7bjlzncw5fwhcyp6l8xjh"; + sgr-iosevka-ss05 = "15qabrrd2ldrkksbgifdx19zcq4hcvwvwnj7k3bga4p56ymh3jrq"; + sgr-iosevka-ss06 = "03zh49jnsiqpxi3j4f82as6c0wm14c9lnvvjq7x4q9xn6hgv87w1"; + sgr-iosevka-ss07 = "0y4m22rrqw3sq62yhrraajcqdrwpw6g3wrzcn24d66z2s0zlsk5i"; + sgr-iosevka-ss08 = "1nsx2f1572i5zj78v60mryiwiaxaj1rqmgwp8bpn95j6v45q3jbq"; + sgr-iosevka-ss09 = "04p0vbl0aa7q761a0mrkgfhv1iy3ppj5hlmr91ppc8ygc3qyy7lx"; + sgr-iosevka-ss10 = "0la09xfllcxdvhbl2r912af900w86lsxw1wz4nfaf6sx0cmq0qly"; + sgr-iosevka-ss11 = "1ivg46g0mhb27mky6ivdijq3nnx5ix2w25nnbhfl7bw4fa0yvqzr"; + sgr-iosevka-ss12 = "1v7kf3d2g52qp4jlhc6b0iqd4jcbx8fj7cxgj86nj50q7g2i2kan"; + sgr-iosevka-ss13 = "050myw7bqi8fjbc3w5wd2449gw7jbciqc0lziyc1z9rds6yihm7x"; + sgr-iosevka-ss14 = "05ligav2dp5hqk8lri8bqpklrj6s8mah5ivmclwcyd2dqpj1m2c6"; + sgr-iosevka-ss15 = "14acj64zw46fbq4d8hqx7vvd6anizg90slszrw0zpqlcp7nc96ks"; + sgr-iosevka-ss16 = "12ykdlsmax302mxrdfaas1xzrn5532dswpc2444gwfp3hzawc1df"; + sgr-iosevka-ss17 = "123xakjnvb9k0wlxgya6d7a79kyaxcdx8hdwkypv7v5b162xbnvp"; + sgr-iosevka-ss18 = "0chbcs283j4clxvx6x72ckkfp2jqklcvswn7kwm4y7yjc0fc1xqc"; + sgr-iosevka-term = "0y5kwfxn4gxqwbav58l43pcd6qspc2pakjqyhhm3202i6j1hw46w"; + sgr-iosevka-term-curly = "1ixspd969sk4af9qvmws17zmlxp1jgizbaw3549pjwwwagk4jx6p"; + sgr-iosevka-term-curly-slab = "0j326l33m4bdkwcjwiidn6liqdihm1d1kb6ccdnkmqw18qfj8hw0"; + sgr-iosevka-term-slab = "0l01nzfz1l379w73vxyjyamjqyrqp9xznkd3gy6zljzky8n1759x"; + sgr-iosevka-term-ss01 = "1fyrzd9q349q2hd4y2xchsvw2h87j3szyqyga88dasskx30z7v3q"; + sgr-iosevka-term-ss02 = "0d3wbc027p0jzajrs1vkn98f0ivl0w0p4wvkdvq2f042z4jagmm7"; + sgr-iosevka-term-ss03 = "0n3034kvwbc55gawm358g5aacpnp81krkm1d5ypacb508pjgjdyk"; + sgr-iosevka-term-ss04 = "1jdsan75k60n3w3mrgs9ciqr597jv9dgs2y99hkpdirqxfixyhga"; + sgr-iosevka-term-ss05 = "0p57qlkzh6y10klhrxfa9x1iccjn6jfq3974irhki0r6b0y0bsj1"; + sgr-iosevka-term-ss06 = "05mq1r01dnkh40jjrgj0lskqsqfcnqqzz9ssqbcbf3cihfrwfc28"; + sgr-iosevka-term-ss07 = "0gkwx1yw2ajcgnj8iifhzxcwpf8f9afs1wl240kfzwsnlr4gzr80"; + sgr-iosevka-term-ss08 = "1173gg7pfpwq2f8rq664l5l3491sj2q3i33gyr1cqpmcsfncnv1i"; + sgr-iosevka-term-ss09 = "12p3a68rd5a3s0z2vf6gbrm2jm2q4drlwb7v7jkrxyi7idhw26fi"; + sgr-iosevka-term-ss10 = "10mwk14v9d8cd162pm237hs5kkyi7vlg9dwj63i6q2a6xjlqmcdp"; + sgr-iosevka-term-ss11 = "0s055c7hmjva7sb4rm1fiwbbkwcrxh4qlzjxhqla8n2cwdyd1r08"; + sgr-iosevka-term-ss12 = "00g7038p7d187zz3sf87px6qzg4dsrcyfzag8a7r3wj84v1msx5n"; + sgr-iosevka-term-ss13 = "0v38d2jhvbd63f47krvg840v5f8cddq0imy62bfaknvp8lmdl1rl"; + sgr-iosevka-term-ss14 = "022y7rz00vjk5xhqi6rmp5mpj2gzayi9qam93ymrhk2nnm26fpr1"; + sgr-iosevka-term-ss15 = "1sr7qlr0jd5fi2avkag2ls78n37ddmfqa00jb38bpas4rcm2c1wb"; + sgr-iosevka-term-ss16 = "0wj51pvx4ijm27afh85bhw3cdhczrxhkzdnhbl18rjccvxyy121q"; + sgr-iosevka-term-ss17 = "1dcby5m73a679vl8q5ipxbqby9ivknybyjx3z24z53w5h2ad4s5p"; + sgr-iosevka-term-ss18 = "114fpyh2slwv900h7zwm07rzcx97k2153fxvnbbnyjgjhlpdkbjv"; } From 5b66ff4591ea15601c7df97488162120e7b8795b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 01:31:19 +0000 Subject: [PATCH 043/221] python310Packages.tensorflow-metadata: 1.13.1 -> 1.14.0 --- .../python-modules/tensorflow-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index 49c2124c7952..be299e867d32 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-G7OEupjKDbblp96u2oHVdSueGG5NON5gvYhuvyz4f3E="; + hash = "sha256-ZfX25CaV+tZVdas+n7O6Gqv1GxOP1iwippIXxfhcOfg="; }; patches = [ From 2c3bdc8804f555b9961b535f184e12e171e4737c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 01:36:02 +0000 Subject: [PATCH 044/221] python310Packages.aiowatttime: 2022.10.0 -> 2023.08.0 --- pkgs/development/python-modules/aiowatttime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index dde165c5bf87..fd5da5c330d5 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiowatttime"; - version = "2022.10.0"; + version = "2023.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rqmsUvVwXC/XkR/v2d9d3t7u6Poms4ORiOci41ajXIo="; + hash = "sha256-/ulDImbLOTcoA4iH8e65A01aqqnCLn+01DWuM/4H4p4="; }; patches = [ From 76cf59a3f7de49a651d05152654e85ae7457faa2 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 30 Aug 2023 10:08:36 +0800 Subject: [PATCH 045/221] reg: use sri hash --- pkgs/tools/virtualization/reg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/reg/default.nix b/pkgs/tools/virtualization/reg/default.nix index eaa937f6f326..84aecc3ff671 100644 --- a/pkgs/tools/virtualization/reg/default.nix +++ b/pkgs/tools/virtualization/reg/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "genuinetools"; repo = "reg"; rev = "v${version}"; - sha256 = "1jlza1czfssssi3y9zi6kr8k9msfa7vp215ibhwbz4h97av5xw5m"; + hash = "sha256-tfBetjoJkr84XLEEcfdRTtc0UZ4m/uRH1Fpr91lQn8o="; }; patches = [ @@ -29,7 +29,7 @@ buildGoModule rec { }) ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; meta = with lib; { From 3ac1129f1d971170d25c7869568e09c753f07b14 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 30 Aug 2023 04:20:00 +0000 Subject: [PATCH 046/221] vultr-cli: install completions --- pkgs/development/tools/vultr-cli/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 5399293424b1..68fbf5c52aa2 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "vultr-cli"; @@ -13,8 +13,17 @@ buildGoModule rec { vendorHash = "sha256-61hdhkFyp4an9KtqDzB4Sd2+t40QEoLgq7MvUBxEQKs="; + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-s" "-w" ]; + postInstall = '' + installShellCompletion --cmd vultr-cli \ + --bash <($out/bin/vultr-cli completion bash) \ + --fish <($out/bin/vultr-cli completion fish) \ + --zsh <($out/bin/vultr-cli completion zsh) + ''; + meta = with lib; { description = "Official command line tool for Vultr services"; homepage = "https://github.com/vultr/vultr-cli"; From 92a0537ead23a9fed028ec3df1c05e1cbd5231de Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 30 Aug 2023 04:20:00 +0000 Subject: [PATCH 047/221] vultr-cli: add meta.mainProgram --- pkgs/development/tools/vultr-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 68fbf5c52aa2..16dfcd878ab6 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { changelog = "https://github.com/vultr/vultr-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "vultr-cli"; }; } From e06d12d71519a7164d337525c4c45d8d2bb2fb11 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 30 Aug 2023 04:20:00 +0000 Subject: [PATCH 048/221] blackbox: 2.0.0 -> 1.20220610 Upstream dropped the version 2.0.0, and its tag is no longer available. --- pkgs/applications/version-management/blackbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 2b4b09fd2500..bee8da850b70 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "blackbox"; - version = "2.0.0"; + version = "1.20220610"; src = fetchFromGitHub { owner = "stackexchange"; repo = pname; rev = "v${version}"; - sha256 = "1plwdmzds6dq2rlp84dgiashrfg0kg4yijhnxaapz2q4d1vvx8lq"; + hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA="; }; buildInputs = [ gnupg ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --replace "PREFIX?=/usr/local" "PREFIX=$out" substituteInPlace tools/confidence_test.sh \ - --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:''${blackbox_home}"' \ + --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:''${blackbox_home}"' \ "PATH=/build/source/bin/:$PATH" ''; From 905323a083dbfd5bee84a30a7f332de28ecc752c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 30 Aug 2023 04:20:00 +0000 Subject: [PATCH 049/221] ocaml-ng.ocamlPackages_4_14.merlin,ocaml-ng.ocamlPackages_5_0.merlin: 4.9 -> 4.10 Changelog: - https://github.com/ocaml/merlin/releases/tag/v4.10-414 - https://github.com/ocaml/merlin/releases/tag/v4.10-500 --- pkgs/development/tools/ocaml/merlin/4.x.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 0a5d317cbcec..6cd8154877eb 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -15,7 +15,7 @@ }: let - merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.9" else "4.7"; + merlinVersion = if lib.versionAtLeast ocaml.version "4.14" then "4.10" else "4.7"; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; @@ -24,6 +24,8 @@ let "4.8-500" = "sha256-n5NHKuo0/lZmfe7WskqnW3xm1S0PmXKSS93BDKrpjCI="; "4.9-414" = "sha256-4j/EeBNZEmn/nSfIIJiOUgpmLIndCvfqZSshUXSZy/0="; "4.9-500" = "sha256-uQfGazoxTxclHSiTfjji+tKJv8MKqRdHMPD/xfMZlSY="; + "4.10-414" = "sha256-/a1OqASISpb06eh2gsam1rE3wovM4CT8ybPV86XwR2c="; + "4.10-500" = "sha256-m9+Qz8DT94yNSwpamTVLQKISHtRVBWnZD3t/yyujSZ0="; }; ocamlVersionShorthand = lib.substring 0 3 From 4ed5111c39720dedca711800727938244367bdf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 30 Aug 2023 07:52:29 +0200 Subject: [PATCH 050/221] thunderbird-bin: 115.1.1 -> 115.2.0 https://www.thunderbird.net/en-US/thunderbird/115.2.0/releasenotes/ --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 698a418f270d..85d03cf20317 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.1.1"; + version = "115.2.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/af/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/af/thunderbird-115.2.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "872d8cd7580c31e60a8524e3e55a40907e4245192adc43411d9c343badb917bc"; + sha256 = "61aa266f12d70ed10d8d6ba410c0462f32ac6422600b72db04a3228ec0ccddc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ar/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ar/thunderbird-115.2.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0d53090a0100b42c3b8493fea6b32308a475cabea5a54d27baf4b3313edd645c"; + sha256 = "9c7c2ab86647eaebdf83997988d4c20a8d1c68d10951c7a200ce7a1ce8231ab6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ast/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ast/thunderbird-115.2.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8e8dc261496632d336bc003df8e9ecf63e1b1002f5357097f4d8aee91cb803b5"; + sha256 = "83196ba09454fb9dfde6d1ea53d8602cee4523664b8bfd475bef12dbc4f63887"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/be/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/be/thunderbird-115.2.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a48c0efcc48ffea6052beb5a6be8f3155f010bfb1269bbd829d4c1026af9b562"; + sha256 = "312b8dc35dac42199722ec5e7e48bf1bd841668f3b2f3c22ebfb1ac81faade4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/bg/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/bg/thunderbird-115.2.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "dd3674ce73ad8f7cf40f2da27018104b7c3161b92ddb050bb19660fb6a4344ba"; + sha256 = "7e6d404a54c30eedf3ef131b25cbc6da1bdb0eb76ce1537274531a9d049ba2d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/br/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/br/thunderbird-115.2.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b0c6616fb7f3f5a74ac782e3d67980e88bfb7a3773688cde9c781bcac4c0e7da"; + sha256 = "fdd7f5769a38e04d2a6e6b24a653f073306ac557d2500dcb331c006bc5e77e7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ca/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ca/thunderbird-115.2.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d297889e32a16375306a5c8806d2fef7ee43b55d2b7209130cda174f9b26da6e"; + sha256 = "e64e76588c9616ac4a9a70d228e9aa43e295998b813e69271d4c1d623190308c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cak/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/cak/thunderbird-115.2.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "546e3f398171a5183e3e631e67510479a4e6c93bdc816e766fc01ec275ddb948"; + sha256 = "f0b0e11953ebdd1f0eb97db8dd5870a177ff4b573d8c5017a9c8efada2b25828"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cs/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/cs/thunderbird-115.2.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6ec212531f9fa449ead2b7cb0ef12b4539a89111a61b9e110898fdda25a3ea48"; + sha256 = "4538729529c69372ecef07c067c04240d244ca7ff744d338cdc4701be536a70b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cy/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/cy/thunderbird-115.2.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4b76d0f87ee13952e92997c353effb1600eec640233bf047850873ee3f81a276"; + sha256 = "580af713d4db3d8006dc00b74563c7bb9d394a82c6882d6ee8855f477e3d9277"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/da/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/da/thunderbird-115.2.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "28ce47778c87ea5dfe147a1598a179a3f3f1c2e65dde87e6a0ef97eb502c12d2"; + sha256 = "0796930e9e85078dcfb9cfb41460777b2eda9a79d8befd08cc34a0a5ac054267"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/de/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/de/thunderbird-115.2.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "47863c8bc2c0879c4eaf80462088995775a511596d4bf0a427b5c1d61afb6cf5"; + sha256 = "66a476a74f29db86d4b233b750d0d68c9524c5442d66e700d9a6c6b8842b5118"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/dsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/dsb/thunderbird-115.2.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8736176caf4bb23036f92b21f4f26e078fc2a63b4ecd14b9feba2f76bd59963a"; + sha256 = "77ad1962c476d1ce1b084b8e6300cb240eef669a75fb9a14eed705111014b9d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/el/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/el/thunderbird-115.2.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6521361499b1ba1f9d187ec0e2650258d3acc859abf2a0663d0412eab71ac7c1"; + sha256 = "5a851f0063ba85f071e676fc5ed61934aaf7bd16efe30986a4b302d21e7fd2ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-CA/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/en-CA/thunderbird-115.2.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f6739c95c4cc08bdd34608b60c7c80de78c021ecc56ce8189f68e1decbed3daa"; + sha256 = "4862db55345da4bdd1c9d2ad26687d1329e7563f51ff97d2e158ac1144787c23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-GB/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/en-GB/thunderbird-115.2.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "79924357ed316530bd5ba51b433ff85536f5b28b6695e453421f18473c5c11fb"; + sha256 = "7499e5af4e8247858023f32031a53ec9e6771bf7b5ededbed2b9e4bf5792eecb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-US/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/en-US/thunderbird-115.2.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f64d1d997b67feb35d650c888ddc0bbff8a3864f30449088d4a519c8f845024c"; + sha256 = "7e6d8a85bb88c70e20110e400044f6286b6986196e811158932663c2525cdefb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-AR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/es-AR/thunderbird-115.2.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "53c20ba1f88865138b23b519f733b70baef27df7c4f6c51b3e9756e2f311f7a9"; + sha256 = "fdb51b5ab28fadbc3c2457169b5fb6559dd3705966039a7bcc4b68fa6a97c21c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-ES/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/es-ES/thunderbird-115.2.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0c0fb320b95b68816bce731bab89a5839d8e23bd8167f7f9da0903340611c03d"; + sha256 = "ca3966b2000359a0d00d5cc0b81d842ef91f5c24dc0ff46b72053775a1aa6b45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-MX/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/es-MX/thunderbird-115.2.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a3c8abf11b6db215454747a4f306f12eb38aa9dae60244938bb9b888dfb16f1f"; + sha256 = "bf4c9990e24f31a2551b3d9619c92421b8e4c2101135bcdeac8d37d289533763"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/et/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/et/thunderbird-115.2.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5cd8a13208f85627396a50ea2de03c0254596dafc01f6770b2e3ea5978d94f25"; + sha256 = "7666cc462a32dd8dd2344d51418cd037223b028563c83c801d86ccbe32479311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/eu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/eu/thunderbird-115.2.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d117e7ff7d0ecd8c0075084ba35ab718f46f564cef3bf0afdbaa5db725143600"; + sha256 = "849a865167057f39ac52f23ac256f03daf48e822738d53f3bd8402451167b371"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/fi/thunderbird-115.2.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d9811df05161c13c2908fec18b86249108996a3355a44e0a098d92542392ea05"; + sha256 = "746391ea471db27c662064e81a2d552b299f92b70ef6866df5668df10d2d6db9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/fr/thunderbird-115.2.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ada502c6e5b654332d00183a813db3f39a1f56ff67486dfcbdfd3034309d5082"; + sha256 = "ba1af10295023906c8c92de0518e95be2f6fa236e0ae1d6916aee7b2e105239b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fy-NL/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/fy-NL/thunderbird-115.2.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f41c0c0c209160f11c1fc80da4df1142a4ff7373252badabd1cb3c3fec3e9fe0"; + sha256 = "4176e4a93c66d958d8ce62e9a9e942176ae708b3e4b727f2b60f300d66776818"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ga-IE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ga-IE/thunderbird-115.2.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "615f820a11d7563a066b8b39c85ea7bc6cad8a7ec39328d3191aa1e936041904"; + sha256 = "83c6b85d725d578d748fd93bc8d77453aaceb0576de3235522ebeb73bcc9e7e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/gd/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/gd/thunderbird-115.2.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "dc72e38443d503db656efc08a65a141aa7a9973b89f69481ee26fd7df7297fca"; + sha256 = "cc46405104f7629b8ea6f4e22f21c5eff4e486f61e55f9e3f5b951571ebd850f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/gl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/gl/thunderbird-115.2.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8cf4b092bb130177e378ec06ad548b40059a91ce701f4d98f992cc8639d1ec15"; + sha256 = "3812756f77d734bd02272eef603d2f31a5a5bf1d3872244b9e50b7dd32cd640c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/he/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/he/thunderbird-115.2.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7e367ceca2ba4b6289ee98445cda8ec8adcf22d668f7808ba555e11766a6a05c"; + sha256 = "4ca416569452f5178d892b0191ea9a0fbcf62c015889d8eb3137c7010a7c5204"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hr/thunderbird-115.2.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9581a29a2031040976645ade6fe84006a5dd26ebfc65b289efbd9fcfc21e5e1f"; + sha256 = "68c46cb089eb49e026cf4465e3d68be735e98c7b9b95281b66c01c3b57daee9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hsb/thunderbird-115.2.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "eb16e4b20199a18aa0b3610d0007e64d4c03c4533e66e606094723801d8dcfb9"; + sha256 = "77a8c524fbf8bb05c88446f5005fb0fa32fd76f1d34b9db7668452fad77cf9eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hu/thunderbird-115.2.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "25320a33107358a2cb3ee2f2f6841fc3474a5348c208271a654db022ea2749fb"; + sha256 = "eb20883ecbf4546c1d8e8892a13c79e00dc14724b797a2c06ac01a1d755fc2d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hy-AM/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/hy-AM/thunderbird-115.2.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "07326ebd1420544b7954a25b8208ec3023434a49893de93ccf2c1e8e7716d279"; + sha256 = "9cc14fd4e3e842bc09e4c6c6e14c42741c4ed3d0cc4e5acbdd5339a268971321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/id/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/id/thunderbird-115.2.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5263bfbed08ca2c80a984ced0cd7cd83eb33ae0f33d2c49153443ee9568d6458"; + sha256 = "54403d78f24f9f1ce1195040963c36d0bac466f59956248607c8043d411fea62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/is/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/is/thunderbird-115.2.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b085dfa757446a301630f7deebc24f67cec720b8d7200700c230b2472bb35a26"; + sha256 = "d4ed45ce1c2847002007ebe50edf59eda9bb6a286a76eb6ea38b8e90bc153c59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/it/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/it/thunderbird-115.2.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a1ace8ac23cef4e74c4dd231125291c95f12773bd4fc5691c7ac137b325ae588"; + sha256 = "228bd4f80238e30878adf3ba1a7c9c0675c10a6a7071b7c96debba7795c41997"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ja/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ja/thunderbird-115.2.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6ced33b4003339a09c727d664c0645ecb68d60f8c0eaa8e8c85ae3b6b737eb45"; + sha256 = "1b7326713eacfd22a9b4f33db10a386bfcfbd9c2feda032c4631aeb2ff29db7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ka/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ka/thunderbird-115.2.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "138cb5cd29d39e0e02be5ba51d45fad0f765a675465caafb3464e6e106d2a1d4"; + sha256 = "44adb3ec23783b2f7044d545eabaaa26b044d93ba3cae254c721cb6b5ce9c202"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/kab/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/kab/thunderbird-115.2.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5e33eb61b6b2dafabff99d9ef5273ccdbe37f60add70141fb6c24a8ffd24993b"; + sha256 = "14f9341a7ec249556c0285743c6e2342bd7ef3428e5f67cbd137d9d48c176b44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/kk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/kk/thunderbird-115.2.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ee6c25bdf4ac8f35055d24217ed11c39a7cf8c9e26b25c878440ac4f3d17ba4e"; + sha256 = "2d45332e97b17a1fa3f510d583e5d889052382eb3cc51b1c1aa795abdc15cbfe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ko/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ko/thunderbird-115.2.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "44204e452f609c70c7416928d6b4224895685f64cd82b9fd1638142526abc496"; + sha256 = "e5fffae30d11aa07f124eeaaf85fcefaa493d359aada79715de7bafa28c391e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/lt/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/lt/thunderbird-115.2.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d14e22598305a92944e1ce20a1bc59bce8afcdc5dfa2a5c0bfbda14df90b0158"; + sha256 = "7350008c0f6758d448100c910c08c70bdc3f2dc1d035917d98ea1621e811de49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/lv/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/lv/thunderbird-115.2.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "77892ac539b4a6f1e440a6f746fb29094a7e80f3160889eb7d96f7b9cf281a6c"; + sha256 = "fbae2e41d30961d6eb0332ca4874e5051f376cccfc5bbc3d45c37a310a6e2c78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ms/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ms/thunderbird-115.2.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ee7ae86b46f46e87d274c21aa99cda6d8c586099ad8343d7771235529b370880"; + sha256 = "acf35783614d2192096e9a56568405c1a317ed4a90ba1522a4b12b7a36b5f2b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nb-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/nb-NO/thunderbird-115.2.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9ef14346d1c1c83478fc95dccb58cd1819eba9e9ffd2a0cf3ef703d5f36f0390"; + sha256 = "c1338953e49591abc7cc81c1e4ca75758a10d5c02af918a31cefb67361dcf9c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/nl/thunderbird-115.2.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "936afadbb7829b965e56c5b5d11a817e97ad529097f44cd1b8fbbe62c8c41323"; + sha256 = "72dd0db24c331e38b90a0530bbd65308f44f503cfb91830b1f0aa76af343b1c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nn-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/nn-NO/thunderbird-115.2.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0a6a81b2e9345fbd4e88b7e2eec928f1d25a09fc92bfa1f9b96423efccf75028"; + sha256 = "e7b454f994ef122993284ff341bcb1212fcf2c81cda207751b3a7ee2478c050f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pa-IN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pa-IN/thunderbird-115.2.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8e38aa404f76523db0d6b910033b555a391811297bc9b1988ef50acdaf37c16c"; + sha256 = "57852e3458e5713777614cd82818b76a58bb229d2e56bf65c590bc7bd1e25e43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pl/thunderbird-115.2.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "847aa25be48228821f817feaa5e7d3038058a37c5abca6d316bed9f8fbbafc26"; + sha256 = "0848d4aca97ede2dd9f2ff3797d911d9bbeba56b0caf5ea8a31b27228cd36c2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pt-BR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pt-BR/thunderbird-115.2.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0dace36f81b8ce7eae24fb5c691cd8c8b99e5e46a1f6a478d4295606b66c65c4"; + sha256 = "6c6bd5d57ad2f4dc798c5e75025fc8a822e79568d3aeebc26e084c95c2d750fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pt-PT/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/pt-PT/thunderbird-115.2.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1b0f69f835a37d4e4921ee85828abd216cef831d1ba1ebaf6178b8e8e7905bc0"; + sha256 = "48c1c7035e7e8ae02ea9efc6539cc4262a285dff31c68bad7f1a4379f1e7ba96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/rm/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/rm/thunderbird-115.2.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b2ace86fcbf898a1512c132eb8cec006093e5f4e1f9708504f7ebc1b6b18c352"; + sha256 = "a2f69dd3668cbd3f77ed7bad7db7a75122a52373c1242045aa596acd59f06857"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ro/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ro/thunderbird-115.2.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "716787eacc023db3bfdfd03461e11a592c20527f3dce5600df9aee51e808115a"; + sha256 = "b49bf0e671e9cde206be7efd42c8c92c036b1e8e399929e93a8025e7b8ea4548"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ru/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/ru/thunderbird-115.2.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "586cc5e6266794b40f46484615bd6af908147cb5efd9d41e13e4dd059ba06ace"; + sha256 = "95863a9b7087def490ee0e9dc0a4a85bdf468ff65791d6910c9a7e663bdd671d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sk/thunderbird-115.2.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "744ba9de8b3828627915e38a03e3353dfcfd7ad46838ed7a17a77a3cbb79a2f8"; + sha256 = "7bcf570eb4f912317c97fb2fbd1ef8cfa6923145f0ffac4932e75e7535f26010"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sl/thunderbird-115.2.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "33669faa6d691307da126c6d094e8c83a41a3ac072e7f3cb450dc5232bea4cf2"; + sha256 = "8b829344a00fc046c35684258e64720d6b2543ba459025e73e26c72701237c49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sq/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sq/thunderbird-115.2.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "75d91f46c85000ca42bbc537080a61a446dd6144441523fc25b3c35c2382f847"; + sha256 = "4a80b2459f96de051145c2c01310962b56605809a8dcd7aa559e1ebf3833831d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sr/thunderbird-115.2.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e647d2aa18d63a78c9bbef4aaca50622340795376cd779aad3dd13914543965a"; + sha256 = "bcbdb38ee9838667080ebcca7b6a0ea27d4ca749d212d657bf6e5d1eb31cc841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sv-SE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/sv-SE/thunderbird-115.2.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fb5832b2416a088ea80b2bae74072652354465b17d996015c7bf46c0da187eeb"; + sha256 = "31f5d267f66d2ac82739c0d3451e3733fa52cb7bbd9c42ea166507e93f1510b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/th/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/th/thunderbird-115.2.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2a3dd0ec84b9982ab55594001761083656db29fbf2cabd4cd5ff823dc2031088"; + sha256 = "64855e9a737bad4506725bc27a4d3e58663b4a2492869a9aaebe1d0738b18aa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/tr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/tr/thunderbird-115.2.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c88b1264afc4a1aa323bf670ba164b93c725f7c96faf016a31e9de51ac227d0e"; + sha256 = "2564fc331c1f3bdbe9614cb32370bbb5b8d6ba3015af19fa938f9320e1b2ca1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/uk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/uk/thunderbird-115.2.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4c0957e036d29f72df09836dc814dccd115d05fa4d1af3c9d4c0c89bcd6e0c8b"; + sha256 = "9a751fe34659cbb237ac46b0d2a017dbe41f896024c396fb64101f165e487c6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/uz/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/uz/thunderbird-115.2.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0c2959d777f866c49a9d34fa47056fb23727078677735db280458c73cee14655"; + sha256 = "0667a84599c8db877d7a0e0e824b9d8e0e036848033edc2d70a766d5d107f8c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/vi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/vi/thunderbird-115.2.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "326659c38f5417b4fbfdc94b6e1316e0bf926a936882e66650ade39d2caaaff0"; + sha256 = "f53fb64857ce9bb471210850d79ce7f06d1bb0476739a1b279f95b1f64520dae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/zh-CN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/zh-CN/thunderbird-115.2.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a50416f5e05a48ab3a57217083ec3bcea8bc7ce89544edb0645af9e62c9d656a"; + sha256 = "6a79d33b99c4b7ec33824c02d9908827b499294e90722f250441c980aca7e6cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/zh-TW/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-x86_64/zh-TW/thunderbird-115.2.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dfa3ffa940ff68cc76a779ee36558df1431609d3f683792b9f9f1c04d9284526"; + sha256 = "5798c36bb002a6d9420713e42600690afa7cc1fea1d2df2c9a676108da51122c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/af/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/af/thunderbird-115.2.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c1978ee67b4fb4391f1fece97de85e7843f05ef6eb58463a5bcfd21a8018bff8"; + sha256 = "91529d632a61d14d11935fddf65da701b936f6e8fe7b86da0b1df4621ebf3a87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ar/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ar/thunderbird-115.2.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "abb0a497d824df51b2d78be14c114ff2eeb27164940c4ffaa82375558b14a0a2"; + sha256 = "e73a6b62f5b5087fc3e62288f622affecb2461766257fe43f8b7c1e064ffb4cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ast/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ast/thunderbird-115.2.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0e0a52a74e17492d39fde141cc59c6b0bfd55d9cee338d1f743608778e2cbbfc"; + sha256 = "a664089e193128bf13f5e66dbd044247b934c0c7f05ae7d2504a6751ce9f31ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/be/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/be/thunderbird-115.2.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "36a25c4ca43dd8cb23c22784288dd46f6af548bf7161588cc2b1a528f2064d18"; + sha256 = "a81e320d3614636eb0ed4b23694cd150f7fa1ae9a9fba7a345ffd3a4a7d7c05b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/bg/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/bg/thunderbird-115.2.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f81d6037ff8d2df244f0de797ae5baf598df3a55a5aecb8efbf8de93f9e67f3f"; + sha256 = "b6c1ca1a2abc4d66610f7a2c8c429adca3b709b828b2ea5da548a6e025571293"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/br/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/br/thunderbird-115.2.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "e90f883adc3c2c6a13a56ae6ddb62ae748950eab2782d96bc5fdbcf25c1c0500"; + sha256 = "ea39ef65c98c89fa0e537285fd063d1733e4c82384f69027825051f55ec14ced"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ca/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ca/thunderbird-115.2.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0e082f0ff5ad81fc49c77ac5cd2be0abfb09f63862ed6f8c9780976c1a2b4c48"; + sha256 = "5b4c3444f5da5f5a3c66f27cb144cf1065290675eeb445a33f45dc3058d69f0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cak/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/cak/thunderbird-115.2.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "963b9ce6127a3df5f7023b0e561dab8f07134152c458a664eef27ad1dbd48ab8"; + sha256 = "042b483bb595cc9e4b4b676f50f4011d18be100a24dc5f11e9e92459a783c232"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cs/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/cs/thunderbird-115.2.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "df5cc5f011f80c918214fa6b5e40e8f2901c80b28b9bb55a0a82d54d043180bf"; + sha256 = "aae95000a972a569192ad1ce3ba230b3f03d09f6d54414550f9c37da14390f84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cy/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/cy/thunderbird-115.2.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "cf445349e665e4717848ae68ebeff5b7df7a53b531e8a5e51e4345037bb909d9"; + sha256 = "eaca1be55346bff8449988f4da16c2a543211172e72f21e09ebc2d476e0bc045"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/da/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/da/thunderbird-115.2.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "783039eb62122cd9f8c206d63b2a9779e19e7c0d30d5fbce84b7a41c2199e625"; + sha256 = "4de1cfeebf2e009aefa0da49ded961ee886c1cfb37812cb0d5272bea2329ec55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/de/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/de/thunderbird-115.2.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0db7f5d044670713dd13bc0dd059fe6f4026f1929e5767b804047731d4bf2e1e"; + sha256 = "3fdf99f3c5d6281b646ca83d83bef7b6d5f6f8e7ddca4524e035624f434ac861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/dsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/dsb/thunderbird-115.2.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "592334f160a3081cfb04273a5c927259b71e6594f7bf666c18e67ec874d098ba"; + sha256 = "1cfa9f74113be33f5621920cdb7d5a3b0986936a97af70c3ab8919f938992773"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/el/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/el/thunderbird-115.2.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "78f2ee6c467f223a53ab092098d0bd003db72b89f996888d629ecfb978536a28"; + sha256 = "44b0bd6e4df10f1c954609d1e75736e03b7a4d55b1d13ed62f376c2c265c0b55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-CA/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/en-CA/thunderbird-115.2.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "495d9634e09315e6304bbe09539271792dc0f513308730b70727b255ac33f758"; + sha256 = "06f9c43c5fe4d9fd1e33422930eaa23ab5b2b8588a1f9fc16233302f9442b251"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-GB/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/en-GB/thunderbird-115.2.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "05626bde23fae4b2c9677c6ff418d8c84eb5ed5176385f63c070e27ddef83e1d"; + sha256 = "3cbbd48aab007524f210d6291dbf90e931fc8219b88ba8043792297b070dd6ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-US/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/en-US/thunderbird-115.2.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "594f8eef7c8368b5e7d028b089345d9e69c92eb3494247356a588354f53e917a"; + sha256 = "ebdbad72644aafded6c91902020463b4857cb5c9c26d4e60413e3c5135c6b4a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-AR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/es-AR/thunderbird-115.2.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "99158b0eaa335bfbce19e5441f304cfdcbd6bf5f572138ede3230305bfe4abdf"; + sha256 = "bae033f12148a332a048ab49735c68f313b7234419e81c3073a00462b92a6e74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-ES/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/es-ES/thunderbird-115.2.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a68574ab121e567a2b35f223f1dea71c33fb0a76fa38b566d93121f6602202cb"; + sha256 = "518f78442eceaf9ff8f7928da764dbc9c083cfc65ef4b2bee6a68dc576d36b12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-MX/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/es-MX/thunderbird-115.2.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "1fa0a7ac757476895997c2203961980ee6f912c1839d6e66a29a74059bdc5c17"; + sha256 = "2c5c4f0eef368950bb6717884f0c4cf9d7960d91ea1ecb7ccaec85b5e0d4e4cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/et/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/et/thunderbird-115.2.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "aecfa2e5600351400edbd5466adfae4ff49eacce5d8439c41f75007e9a1ce3d2"; + sha256 = "5d8dcdef1ac1065989423c63f1e2e5708f09307e08a6602b5a70cf2c36a16223"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/eu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/eu/thunderbird-115.2.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2302d42abd183fdbfcba73baf25bf4d0b855c79d11a7fc24b24b25a18dce92a1"; + sha256 = "7c7667e0a64668288a1d26e6128b7b152ef3404c6e0762492e9b3f5e24727aa9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/fi/thunderbird-115.2.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "314e9a7b7c581839dda8c0e031cb78931cb6b48c3740291dba7560ec21c5af99"; + sha256 = "425f2f5435bf0291f23399b3b328f36c71aaaff96cda4e8e2a5a2bba0a23496d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/fr/thunderbird-115.2.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8c1209785c71cd8b0e80d8823c3788370bf81a01eae7f7d34272f3dc79a8aeab"; + sha256 = "41de58dca0746dc3d287ea90f392c674bf5952850971099c7a9e386ed2519d0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fy-NL/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/fy-NL/thunderbird-115.2.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f8183a123a64960541795c2b472ebb45c16434177eb6491487b9091a7a38bce6"; + sha256 = "2643feb7e52f6682a2601bc662007ecc013f452c4aceb846bd32b0ebe957ca3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ga-IE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ga-IE/thunderbird-115.2.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "8cc7f3895b6306acd0b3cda7de02748dbc63c390398b515d98a8d67b1b02b901"; + sha256 = "b6685530788759744292aa55c8c916ed65dfd4d0d8f60d11498234b5331c5a98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/gd/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/gd/thunderbird-115.2.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b96b3e0e9bd2cf1e1864b39cc33214a14515f41198e52cce25cf3c5f222978d8"; + sha256 = "f85c93f45feb79d667c756c3b7a4b51c2c05d939e1a6217f97274e22cc1e900f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/gl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/gl/thunderbird-115.2.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cc130514df833c06a097ccbff69d36a7cf9dd96e040617e4b28d7d087dd09239"; + sha256 = "344599ba40698d94b5e0633ceb7e1e22b0e0d5bdc93c2ef87f8b4969cec0659d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/he/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/he/thunderbird-115.2.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "934cacd035b4ee93d09ae6e69c03dd7e2c167ecfefd3359087399e1a20014c34"; + sha256 = "8316345181cf6396e1e4bde4e0b4690c925cb106334fd5bdd4a550f6bd5c4f6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hr/thunderbird-115.2.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f9173f380c1b27d90132d65c5789db7b0b0fb632c680b7cdaec1e8749d74fd8c"; + sha256 = "ab678d0cd79e6e8d10e2e5db8c947b796bed8d4069a42fd9d86f5a5b752ad111"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hsb/thunderbird-115.2.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "51001276bff6c87f34fc9eb9d0400425176207f7f052c51fa98d85cba96aec57"; + sha256 = "4d87ef768342eab2ce83b55774a1cb7cb0605adb0607dbb66cd1fbeafad4f0fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hu/thunderbird-115.2.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ac330ac95d73c909c739937fd8fd4e61d987cea8da211cbcb86c02ef13ebf1ac"; + sha256 = "96e8d4599fcf5ab4bcc178f372e3d84c9257f1e41d6e06b7975df9f4f6e8f178"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hy-AM/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/hy-AM/thunderbird-115.2.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "71805e3ddfa74699b1c06d0dc2f3dfd3c2faf4332a5dc5f27e4a7cbb2549a4c7"; + sha256 = "72788149439cb96e3321971a6e52dfc3884a337d7b4ff9c1ac0897e9566cd123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/id/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/id/thunderbird-115.2.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cc25d0d5d79d592cfccb8f516c7e06132f071c61fb3e72beb07bf9d6b3ad8765"; + sha256 = "4124a860406abb86ca017597aba9c90cea9e20b8955b3367b29113efd1a16421"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/is/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/is/thunderbird-115.2.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "228e328079179a09817c00353219c8339ffbdba644cc3ad7d2bba13961d67b32"; + sha256 = "2b08e55e0204e0f49db6c128d21ebfed7073c4f85a7b33926f0f38ee0cebdab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/it/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/it/thunderbird-115.2.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e8aa0180d78042ee15612ba5460316daa09284acbc313c22da0a64266c522ff3"; + sha256 = "ca719ce8f719740565c79c94053ab52a3a491bfbac2b117a39b9e2f13aca4df9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ja/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ja/thunderbird-115.2.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b36f21877ce33d928dba32f6fc307c2f46bcd6ee9f9bc66c04beae7ff2355371"; + sha256 = "4765280d30df0da1c1f3b47f8470c96445c343e1a3f87eb963847baadc501803"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ka/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ka/thunderbird-115.2.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8eaab25f84eeb672b4ef395f71a58e721f0a6492ea89b050b23bf087d68788dc"; + sha256 = "828f764efb051f581987d98438bca3e7eb9279c14ecc65f3450632bef4b9b654"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/kab/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/kab/thunderbird-115.2.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "33f1d9380787cd09614333f2114c5992f9dbb49f1b2e0271d03916823d473017"; + sha256 = "76b77c92e347088fd1c1ae649d14dc019a9083b5ae08227204aad83da4b2a061"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/kk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/kk/thunderbird-115.2.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "61983a14c8c1d39d88656d0b88f3edc2e65d1167c2087e22e18b6b8c942cf5a0"; + sha256 = "a0f745f0bc19834c2e75fc95c4614a78538d6278f79fdc75ea4fc15242764e9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ko/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ko/thunderbird-115.2.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2d6ffbafd5da4032e575df3ced7995d8245516b070748ab7a717bbac01e4c25b"; + sha256 = "3c5a4289618c3e6747586891f5eb47cd69ffc5f6c5f49d154a463abe37440397"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/lt/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/lt/thunderbird-115.2.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a336beddbb32cb4eb3ece06bbfe7ab14b67b97f44e73606b8a552dcb9ac73105"; + sha256 = "e731e745805b06d767998e8ac38eb39191a70236e7223e61148b6006bc81f58c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/lv/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/lv/thunderbird-115.2.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "373b581dd03ce10c72ab03e0e9db16f220daa0e7ace5490372bfe3bad7022777"; + sha256 = "a1090f2be2a884b572ee6cf181a03088a5b0b529abf3af0c0b99f669210b6750"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ms/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ms/thunderbird-115.2.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "73e6efdfe3f55257575852a1b76e4932becdd4e6c1f818e030d0ace26d4733ac"; + sha256 = "eb788a59057959d5cfee9742ad6583513b868957976f6c2d13a5520fff1bb5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nb-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/nb-NO/thunderbird-115.2.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b5d31e6ea54b3928857b6baffe44818d22e8e8acebe27dc217f8d1ccd79c1a4c"; + sha256 = "2112bdcb27163572c48621b5eb9a40688768b4c4951c52bf933269a4172599fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/nl/thunderbird-115.2.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4451ac693a9c43888224710c79b7ed8838435eef35eeadb9097d3d382df7f2ea"; + sha256 = "b3d508660a044fceeb89832af32522b32eb1de88a34bb336a34bd24acb75c5bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nn-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/nn-NO/thunderbird-115.2.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c05356371e506f92e472c7b0a759ab8f9d3b512a987fbb72312131a3d5db39e2"; + sha256 = "de84e54bd4bda94e7f930a47e34ab72b29bf8a43a6f0fdecc7464b1f3526d21a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pa-IN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pa-IN/thunderbird-115.2.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c773cd3074dfc7415bea45253b50a16c872dc6e9120bdd7807ef4a964ea92707"; + sha256 = "3c05bce8ae30abeaa948b08bfa86dfd794a3b699b25240785ef61fcb65ec5699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pl/thunderbird-115.2.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "32c9ec263006738446d4f16c53ca9d2872ac4c152be974cdc8f2c18905120c7c"; + sha256 = "2d1aea7352155b7c739ff3073d790f2ae25e3362abc0232df76768510bb2d8f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pt-BR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pt-BR/thunderbird-115.2.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "110dc01e5f4186b9f7043ea9343f2a3a59927d319da16b969b0f7c7a486e6571"; + sha256 = "dab4ed6ca4f17eeb6fca56e6b08623834ad08997a384f22321af70aaf701cbe0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pt-PT/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/pt-PT/thunderbird-115.2.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d5611e79e78484ad15dd2333d9c977ca6f5b00cb44bfa423cfba8a9fca7c77c8"; + sha256 = "b74bd8217c57fdce2d3dde440b467bd1066bb3b2dd320d6bb06b50ccf4795faf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/rm/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/rm/thunderbird-115.2.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8ae35f806e5a4bc2a5559b74a7766b96833ac5ba469f310358a9d18eabeba235"; + sha256 = "85bc0641509778e489af7efcdefdf80f2fafa1f2179d4096feb63e62bfbf62e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ro/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ro/thunderbird-115.2.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "74cc9cf95a390a259540113f36fb25a5ea4b9d2325c96593f3f34df367aa0cf6"; + sha256 = "6ed9b66c1c8de5932853dcbfd7c0eaa44414ce63beda065ca42424788e58a3fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ru/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/ru/thunderbird-115.2.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "06a91c59dcbefb7812515f016b03d9605a0517b9c06351ff5a6f9b6ce164d66f"; + sha256 = "a243fabbb4adb1027e1368ce6f19a9e1955ee6f42f90658cc74be902c145b11e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sk/thunderbird-115.2.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "70fb2f45e334e91c0da1a074e4646731fa151f688049f6539d4cc63f2e755072"; + sha256 = "ed039d390a61dc3526f2c607a3260332a49db62d7e432a1fdca7fb8df58ad89e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sl/thunderbird-115.2.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1b04aa780472a6d51b21f15e58abf2291b94a86cb5f8e7cc3006f0f85520a88a"; + sha256 = "a0bf41738ae0d1eaaa965b7a47070f11dbc379b0f9955bc2419548b19b7b20e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sq/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sq/thunderbird-115.2.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8cc0cb46414be80f1377a2eb10d535d52c854bf51bc197f137bd16adf4b95a7e"; + sha256 = "19c1ca545d4f74c2d0ca43db5d9a02bd62be29d70d671232657545cabcb18313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sr/thunderbird-115.2.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c06788b23a60d3949e00b9bcb623ca8a1457c2e92e15ac8c5d29053d54852c1c"; + sha256 = "7a9c408f6be3febb9607f6771694eee38eb466f433a49bd3f5e9c25b6f06cbf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sv-SE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/sv-SE/thunderbird-115.2.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4de0b830eed07a2a743a9a6c4e925d0ea149a74e5b0ae164378c366f8ede7969"; + sha256 = "3c0b95887d1fa43e062c8f8a4cae9da99b2b1a0dcee1a312be12316f85cdfb28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/th/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/th/thunderbird-115.2.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d5c8601825b47d4abeb51f386199fb23893f69f6e25870c87e962279c6daaf38"; + sha256 = "6bce19bc6ed566b129667bdac4e8f6c0252b3734167b99877512d08499d97610"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/tr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/tr/thunderbird-115.2.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f92c52b8ef7672aa6ae8b8f33063f1acf274f41ed8852cfb66dbde4d86db7a95"; + sha256 = "ce76f224193339efe0a60aed40ccdd2d0a88fdcd7bd612a181e5df3a96c42047"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/uk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/uk/thunderbird-115.2.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "0ce05dfc43582387f349a56f6e2b34acfe459daecc77a9fc530db9798f77cfc5"; + sha256 = "3340a2dd8c0be2d65b9a0af4e6f296f3998e9ac091cc3cab6320437f246005df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/uz/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/uz/thunderbird-115.2.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9a095f4bf86405e2a44eb0ecb0f630c050bd5c884094f4d9748b40eccc9ddaed"; + sha256 = "03cd2d1f842143a7740092ce9faf11d1865f6d5a60ea06ccc8383d654adbc1d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/vi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/vi/thunderbird-115.2.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a60d9c74a0f8577ad775489e581d19c112d51436c2525f235acf6aeeb4f2ab29"; + sha256 = "575be01c9b893308a3503c1cff3301b0005cff7a63027208f396c4c573e7bb18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/zh-CN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/zh-CN/thunderbird-115.2.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "257b2ef302f202ac0a23bfcec76038f0e665c82346007a68337452bb0eaa1413"; + sha256 = "ce246d95bad26cf9c48993e7ab40518947fee5874409244e1ff9d78c62199149"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/zh-TW/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.2.0/linux-i686/zh-TW/thunderbird-115.2.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "25766f390cf68dd829776ab9065f5d753f42175cc454ddb7c44c96d672464bb4"; + sha256 = "595fa9fb117e4634dcd98ce259fd7c95d588753f67d32f1f75a09c667c12d9df"; } ]; } From 44d4d20e027835554f5a24692710fc976d96a501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 30 Aug 2023 07:52:29 +0200 Subject: [PATCH 051/221] thunderbird: 115.1.1 -> 115.2.0 https://www.thunderbird.net/en-US/thunderbird/115.2.0/releasenotes/ --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index dd580227aa26..ea15f6331519 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -43,13 +43,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.1.1"; + version = "115.2.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "26f69dded43bd24ffce9acb0de204bef8c10c8df3cb82b33594d035e41179cb7450cb7c10470bfc92a933c1d801fb968049ea8a17d838d16de9973f5dddff9fc"; + sha512 = "31a8b16164e3bab60b62642e1adc55b3d97fc4f20cf28207b1e599275eb5a207f60b173fd642e8c52a48e83894e2ab874cb8424c22c5c712afd7169084b0a2df"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. From 3a6fb5ac7a5060f2d863e7f5c6a04f4ba47d0d3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 08:09:21 +0000 Subject: [PATCH 052/221] python310Packages.nbclassic: 0.5.2 -> 1.0.0 --- pkgs/development/python-modules/nbclassic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 6f17d83524c2..79febaf68518 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.5.2"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QPEbvMWeiVbD1e8TLeyOWoU+iT7Pgx55HVTaDYpQ150="; + hash = "sha256-CuEesjGUVdgFWWvzIDNs2pVUtB2Zq5o8Mb+BgL/6MOM="; }; propagatedBuildInputs = [ From 090ea50ba55595d55e7c2d55c886ea38d6bc0dfb Mon Sep 17 00:00:00 2001 From: Paul Dettorer Hervot Date: Tue, 29 Aug 2023 12:08:11 +0200 Subject: [PATCH 053/221] pythonPackages.pydiscourse: init at 1.4.0 Co-authored-by: Fabian Affolter --- .../python-modules/pydiscourse/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/pydiscourse/default.nix diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix new file mode 100644 index 000000000000..158954b711b6 --- /dev/null +++ b/pkgs/development/python-modules/pydiscourse/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "pydiscourse"; + version = "1.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + src = fetchFromGitHub { + owner = "pydiscourse"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-peDkXRcD/ieWYWXqv8hPxTSNRXBHcb/3sj/JJSF2RYg="; + }; + + propagatedBuildInputs = [ requests ]; + + pythonImportsCheck = [ "pydiscourse" ]; + + meta = with lib; { + homepage = "https://github.com/pydiscourse/pydiscourse"; + changelog = "https://github.com/pydiscourse/pydiscourse/releases/tag/v${version}"; + description = "A Python library for working with Discourse"; + license = licenses.mit; + maintainers = with maintainers; [ Dettorer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f36aeb1e0474..4bda951fde63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8964,6 +8964,8 @@ self: super: with self; { pydigiham = callPackage ../development/python-modules/pydigiham { }; + pydiscourse = callPackage ../development/python-modules/pydiscourse { }; + pydispatcher = callPackage ../development/python-modules/pydispatcher { }; pydmd = callPackage ../development/python-modules/pydmd { }; From c3cc9fdc2cb4fef029c983cc8fc46fab78bf74b3 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 01:47:08 -0700 Subject: [PATCH 054/221] python310Packages.pyopengl-accelerate: unbreak on Python >= 3.10 --- .../python-modules/pyopengl-accelerate/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index bc0a350a31c6..f85e825f2645 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -2,12 +2,16 @@ , buildPythonPackage , pythonAtLeast , fetchPypi +, cython_3 +, numpy +, setuptools +, wheel }: buildPythonPackage rec { pname = "pyopengl-accelerate"; version = "3.1.7"; - disabled = pythonAtLeast "3.10"; # fails to compile + format = "pyproject"; src = fetchPypi { pname = "PyOpenGL-accelerate"; @@ -15,6 +19,13 @@ buildPythonPackage rec { hash = "sha256-KxI2ISc6k59/0uwidUHjmfm11OgV1prgvbG2xwopNoA="; }; + nativeBuildInputs = [ + cython_3 + numpy + setuptools + wheel + ]; + meta = { description = "This set of C (Cython) extensions provides acceleration of common operations for slow points in PyOpenGL 3.x"; homepage = "https://pyopengl.sourceforge.net/"; From d6c6b10750ba3fe76300f8e7bbaafe36ced76064 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 01:59:00 -0700 Subject: [PATCH 055/221] mypaint: fetch patch to fix python 3.11 build --- pkgs/applications/graphics/mypaint/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 48cc00d008e9..6381c399315f 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { owner = "mypaint"; repo = "mypaint"; rev = "v${version}"; - sha256 = "rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk="; + hash = "sha256-rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk="; fetchSubmodules = true; }; @@ -38,7 +38,13 @@ in buildPythonApplication rec { # https://github.com/mypaint/mypaint/pull/1183 (fetchpatch { url = "https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847.patch"; - sha256 = "OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc="; + hash = "sha256-OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc="; + }) + # https://github.com/mypaint/mypaint/pull/1193 + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/mypaint/mypaint/commit/032a155b72f2b021f66a994050d83f07342d04af.patch"; + hash = "sha256-EI4WJbpZrCtFMKd6QdXlWpRpIHi37gJffDjclzTLaLc="; }) ]; From 72cbc288069372a74f2fae1aeaf156cd0291b174 Mon Sep 17 00:00:00 2001 From: "\"Phillip Cloud\"" <"417981+cpcloud@users.noreply.github.com"> Date: Wed, 30 Aug 2023 05:37:41 -0400 Subject: [PATCH 056/221] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 448 +++++++++--------- 1 file changed, 230 insertions(+), 218 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8b221876ee3f..27be4802a846 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-07-30"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "566049aa4a26a86219dd1ad1624f9a1bf18831b6"; - sha256 = "12y7fxwlcia92q12wj50k5bdlyhjm70hn3kkibn5a1xf4f9vkwkg"; + rev = "f9dadc11b39fb0b027473caaab2200b35c9f0c8b"; + sha256 = "1j05knmyjmh3n1b8f4wbniy3vgzv9s5kkqa3v5h9jbz0gwkaigz8"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -859,12 +859,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2023-08-14"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "f6d111f3c7ff2fb89c8a39b6280c8f90234196d9"; - sha256 = "1f8kksvsv9pc1k9wrh7mj7bmh8r4n34rah9hj7hksn6y21lzx6cs"; + rev = "3eb26b949e1b90798e84926848551046e2eb0721"; + sha256 = "06lyapgg0fdz6p6bas9cjrsi6qx2b8rjn8ivc3yxhp2940bqqrlf"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -943,12 +943,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-08-25"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "352c09f3e59065299a6e66386f0fe11bb8d5c601"; - sha256 = "1j0iyfybczlnf07fkp7479aiv1q6h2h4mb0r7h2cg3h0i6vprvq0"; + rev = "dd852401ee902745b67fc09a83d113b3fe82a96f"; + sha256 = "0hbfi5876s8zfghlgxqb187cgp3ssarnaapg5n636zyv6m4wyiii"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -979,12 +979,12 @@ final: prev: base46 = buildVimPluginFrom2Nix { pname = "base46"; - version = "2023-08-20"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "930ee200607169a54419d81c9dbee43366495202"; - sha256 = "0ngqr01hlccdih4s1vzncr7pwj2zrgdn7gg1flxhbrbx1nb1kdg7"; + rev = "87a3054bd5cf4f50d42038f3060e5d41bb2d5d8d"; + sha256 = "0iisisfn805mydq2nlx82lwlwj1f4sjc92py1m48ag50vmf62ip5"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1159,12 +1159,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-08-11"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "417b303328118b6d836ae330142e88771c48a8a3"; - sha256 = "0cylncv3z34z76178whji62nsvrs55n8xrmz8bymdc0nlvkx7j4f"; + rev = "9961d87bb3ec008213c46ba14b3f384a5f520eb5"; + sha256 = "0g521d6ngl7wajipqpksarxld0pwdk7878yjw64j7lc6p80si3js"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1519,12 +1519,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2023-08-19"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "f076c6b071e6117d2cbb26d53327ff21fc22fdb8"; - sha256 = "19rc7d2xlsxd7a7slrv4ajydgw7nv8q2qp1yc4bl74xg3cn1mks3"; + rev = "363ce91a198ea255d847a189c723c6d4e3bc4a91"; + sha256 = "033wa4sgg2hmn2wi7g7mwl0cpw4mlnr53x8b0diqlyv5v7wax302"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -2035,12 +2035,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-08-25"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "0b4a13613c871c66648fd1e1f33a4911a0b15e72"; - sha256 = "0b70q4k5jc0id4wryg3qzrm1aa8r44qlkb6r8ddh7x6pyrkwny65"; + rev = "70ba94ac71ead53a9442aca1a86c0c10a16b587a"; + sha256 = "002883k8fvwzc4nlbm3myl560029dlccsvwbqwkggl70qp8hgva8"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2359,12 +2359,12 @@ final: prev: coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-08-22"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "7df79a99f2b2070bc90db60242d372d0e5fc60bf"; - sha256 = "04hkxn21c9qws3l5qcr1ig3bqlsv4nkaqxjkfjgxpp8phc0ys7m1"; + rev = "47a748c18d6378df7aa033527d1b56d6dec94dc5"; + sha256 = "1jzxrkbynpr4nazjkw9b72liamzyb5ziqww51hc1lby72y4q0llc"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2925,12 +2925,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-07-10"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "c6657df5453a6cbe4e8356e1675e9652cadc332f"; - sha256 = "1gz5zg7rfx1j468ysa5b5nnlnsj22pkkkhq4z0n63hp2s09ys2c3"; + rev = "5b9763eaa483250650eb4f60c96db62abbb250aa"; + sha256 = "1ikkhvsxqs3hlcvf7kahjlbfp7s7hkpyqky0c9m6nc0jrlld0lwb"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3009,24 +3009,24 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-08-19"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "ee571505f3566f84fd252e76c4ce6df6eaf2fb94"; - sha256 = "0xahisrz7yz0838ijvg2s6wbskdb443fal72yxjr2h5z1dvzxswq"; + rev = "c7b035de7f91bb6b62b4308f105c56d1a968b8c5"; + sha256 = "07qqgczd6vyqj0cg0g3nx4qd23951i265227d9xjf6g47g1zi3dk"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-08-26"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "32bee2131f1110b08c98c7c64fd1f2e5b387bd45"; - sha256 = "076d70a0nlryva3mnqz6dzc8kpppnj6d7nb6qrraly40qkgxndsv"; + rev = "e36009c5f2873186edf6a10e60e789f95d8009e4"; + sha256 = "1vax3axg2iim2fagwi3w2q7ggf2a69hbx0cb1yr5lwi5ar48l048"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3081,12 +3081,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-08-07"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "e014708e917b457e8f6c57f357d55dd3826880d4"; - sha256 = "04p9rqp7glgqfxajad32lrh96cwx2kfwf5v8qvy0bnqbrhc3yv5x"; + rev = "14856573a09f1ddb570bfd8734e34e8018e8aa97"; + sha256 = "0pvxvm56m8q6vl5509r0c045c3hhqnwfm82c6z99x2iwnrw0s39w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3106,12 +3106,12 @@ final: prev: efmls-configs-nvim = buildVimPluginFrom2Nix { pname = "efmls-configs-nvim"; - version = "2023-08-25"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "cd8876b5afe602f90e53e5d92555980e6b379be4"; - sha256 = "0rjrn0ak3v3q1j8sc7yslxrzp8c5zs0p9ii65483ggvi4fdmyzw7"; + rev = "e244c307f520dc70627523759386d387c73803b8"; + sha256 = "1w0ralyyz2m11hp7ij44cchibbx0z8p81z4fjvizvcpcjs5xriir"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3372,12 +3372,12 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-07-22"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "967117690bd677cb7b6a87f0bc0077d2c0be3a27"; - sha256 = "1rl7lgiwkrjay2zsf97xbp964iqxvqrqc31az6n59pw720rsqn6m"; + rev = "8a8e74922a383c253b7f92e042b749150140c8d1"; + sha256 = "19a1i4lh4ij5x7pqrvs43yw24li1zajxrm6zrlbiffwppl7903dl"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3504,12 +3504,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-08-14"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "377d45475b49e37460a902d6d569d2093d4037d0"; - sha256 = "0yk612n3ayn0kv1smv945hz8rl395ask4wp45iqymvzia6jp6k4a"; + rev = "00e191fea2cfbbdd378243f35b5953296537a116"; + sha256 = "1gndxhlx2qfxg2hrxz82vsy0f2v2v25j6yg35ylscs0dkvh7aq05"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3720,12 +3720,12 @@ final: prev: git-conflict-nvim = buildVimPluginFrom2Nix { pname = "git-conflict.nvim"; - version = "2023-08-21"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "f83d81e706d7ebfb914457ea72eee159e0e16fae"; - sha256 = "1cx5z0anqnq6pskxpj9w180ykv452krkhzh3nly999gpckimdxza"; + rev = "d084646ef4c40e24eb9cac3eed1f1c8bd140431c"; + sha256 = "0sf5flwraiby8dknfphyq1k8xyzz2h18illr7m7snx28dhll2cja"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -3780,12 +3780,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-08-25"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "79127db3b127f5d125f35e0d44ba60715edf2842"; - sha256 = "1dhgvcrnx9mph46mjc1m7h49xyny5gzmwbrii8v0cc40hbqgqnwq"; + rev = "d8590288417fef2430f85bc8b312fae8b1cf2c40"; + sha256 = "1ly0hij1ccbvmcx4axdq0bi9iay5ms1597ng84vmx6bnsd0hlfx3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3828,12 +3828,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-07-28"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "8942dfb05794f436af4fbc90a34393f1fd36f361"; - sha256 = "1lqfdfmmqygk2ljlp8gi647j1bij51i85hwl7adx1as749ym0fb4"; + rev = "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5"; + sha256 = "0fa2g6r3kf103jh5vx493bkkbxssizm8i4lri1pl24mnha871ndx"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3972,12 +3972,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-08-16"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "6d409ee8af4e84d2327b4b5856f843b97a85a567"; - sha256 = "15k67lc73r5dvv9a2wmpkaacngmxld7djq50g2qmgm6aqsqxxj0q"; + rev = "7fb36e0f67aa6f3d7f3e54f37ca7032ea1af0b59"; + sha256 = "0i9aivg66fg9rp9m9z8vzg3g15yfki5c9hrwhd5j577k5m8bybj6"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4020,12 +4020,12 @@ final: prev: hardtime-nvim = buildVimPluginFrom2Nix { pname = "hardtime.nvim"; - version = "2023-08-25"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "3548e7d08c659308d9923effdaa8fa4cc0725c9a"; - sha256 = "1xqd92ihzi37c9kkbdbxfws8hb4c1r8fi8sqmz4m4wj9nr4siqwr"; + rev = "ab488faf43d477f544e6880cd9c1ba51f0fd7995"; + sha256 = "1li49j0dpah5bjxqa8abjxhmlgl5xr6b7gv9md5430zsf9gvikyb"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4055,12 +4055,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-08-23"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "7f87f2eecb0be3fcc92750ffc2c5ec8966e6f19c"; - sha256 = "1by2jkpizwbw8fiw16v9p5h8s68l3fl7glc6sbfkggfmpjfq6mav"; + rev = "9b7e2bb7af2032f115b6b5c591c6bbca5fc65f4a"; + sha256 = "1cpxkrgcw396k13ni284x7swwnsig987yj2wx4kzghannspm3d2d"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4318,12 +4318,12 @@ final: prev: image-nvim = buildVimPluginFrom2Nix { pname = "image.nvim"; - version = "2023-07-22"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "5d8b8b3acbe2ec6fcfe782cbda3a8ebdad9c1b51"; - sha256 = "0s7s803gg2b4wilfx973kf4c2gppsyr747wkwjlms3yjbx8iyb8k"; + rev = "6fcf4a9aa2bae1e8319e5c87b0d180c27af3026e"; + sha256 = "1a8k8pvd9l9zrw8pmfykbn2zva13hf1a8zqyd6pb4b56wyf2vbr7"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4631,12 +4631,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-06-21"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "1749cea392acb7d1548a946fcee1e6f1304cd3cb"; - sha256 = "0ycypsagk3aq9rf5y234bwrj2fw9h1hd73phavjbazi3zhi8yb6y"; + rev = "0a24e504a3a278849ad0aef31cd6dd24c73ca3db"; + sha256 = "1k75i1rjv8xxbd8wr5ll6pk1sabgyylv0h9dhznrrza1g3zkrqv0"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5230,12 +5230,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2023-08-26"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "76f9464aaf130c9fbb958403f53cb560f69a0e2f"; - sha256 = "0dqapw0dk4hhfc1q08q86p71b2bhhc28brphf882fr6ygab0irqy"; + rev = "34fd54bd4fff12ce748c9f3644ebb5052fdbe17d"; + sha256 = "0cpghg6kzzq7ygj518n2izavckhkhmxzfdhr4q6i434hd7g6ih0a"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5387,12 +5387,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-08-20"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "2997f467881ac4faa6f8c5e7065e3a672297c8ad"; - sha256 = "0gi1rk1xihs4k528jff2axjjn0kg7vraihwlwhb9m362c5w14k9l"; + rev = "dfdd771b792fbb4bad8e057d72558255695aa1a7"; + sha256 = "0chrr4n4qjnf6556qxmw41k36v0sbwrk62mkrr1r6q1cjk9wifh5"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5411,12 +5411,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-08-26"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "34b3d0d01dfeba0b869bedf32ae846ef63ad4bd1"; - sha256 = "0l280ayy5vc0g73n5rdb2mbn93mlv9gbz152bxpn01f1f7lk5srf"; + rev = "0942198fb9a998b6ccee36fb8dd7495eb8ba659c"; + sha256 = "0bl2i91za59xl3s1vwmn056ixdw05bwpk9jqrlw3w23rh70s7rzn"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5507,12 +5507,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-08-26"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "6b5a2dbbb80edeb0f4c1b507e0cd41844f5cb65e"; - sha256 = "194vwh7ij81kg4l8j5wpcdjk9n7dnlzksi833qi0p72abbfi7qid"; + rev = "a1b96721dea1e9c7aeeb4bd402b9debebf38ed23"; + sha256 = "0m52p2k4ghc9mcqv9cpnw2p657vdw1svn69hjfh0dgb6s1nd6vll"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5879,12 +5879,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-08-26"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "9b5b4c874b13e372500f07c37187ba06c0c1ac0a"; - sha256 = "1lmfr186zm9axxxly7mvawhs6wxjrkxsyz2ccz7lbnap0bac5zw0"; + rev = "2c992760f154285dff9f798647954b363cf35963"; + sha256 = "03gads1fim5lv90sgxvv16gn3hm32qq9hlm31qjs2hs2qiminsj0"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5903,12 +5903,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-08-26"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "e7f98b9a12e2a741b84e6761e925fc2196ef460f"; - sha256 = "1ngvigsp7s6cjcg1wyxzlaw51l5nzgk29lbbyzl4xqlarnbyq961"; + rev = "1075bd7f23d244f14d691c261b14c38209abf02d"; + sha256 = "114m39r7zy62z3ri6lr0gcj9c1p6mq131234c0im24z0wkb93czy"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5927,12 +5927,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-08-26"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "0d210aa340ec9840ac963938bf1b5d06cfdf67dc"; - sha256 = "1xrr8hqfnka20apg6d8nw208spp9l4k231cp7s1dky7wwp45inzn"; + rev = "183f5a7357397260b631d6cccceccc3621b50f78"; + sha256 = "1mlvpmhllj2if82bir04bfx3nfzzcxng3rp5mzryqlzvpi6a50yd"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5963,12 +5963,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-08-24"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "d764b406a1a6f3db13a28bef10e139a09fcc14dd"; - sha256 = "1akqk8vkvq5cib42vlblp80d7xlqd656damhky16l3hwvg598c74"; + rev = "dc7e5d005287ee410b0a791897fd98131f9105c3"; + sha256 = "0iqq1a9fdrn904a94ggbhyjb0n1mkndxvmkqm0d7yla5h2wm46rp"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6119,12 +6119,12 @@ final: prev: neotest-dart = buildVimPluginFrom2Nix { pname = "neotest-dart"; - version = "2023-05-29"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "f404d558c0ef8a463bf2b9882b6116b6b2301030"; - sha256 = "1ybzva7qk9h58i5l114977lc6dd17w0zjy1dgfiz2rqckryhrmlv"; + rev = "178c62282d5fa82f3d564b3c256b4d316804da67"; + sha256 = "14305ynm3pf6lx0gym40wc1wcphyja1i21lvdnz5yh65x512z2nj"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; @@ -6180,12 +6180,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-08-20"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "ebea2f66e35d2c19cd2a9a0808b6caa8ff53d341"; - sha256 = "1lkijcfvf7z37yir9rb65293snq3zw42pw24yncgj79mhypc47bq"; + rev = "48bb3cfbeb2ad7990382fcd1dc6a903433fd4dac"; + sha256 = "1h38v40py51mwdqdjrddm6ib2cvwm22kprapvgch5zgdn946478h"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6528,12 +6528,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-07-25"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "894db25ec726d32047799d4d0a982b701bec453b"; - sha256 = "1vpdl0905vxxbcc354v4g2m2nrpc7fmzpn2yjwgmwz34wacvmik5"; + rev = "74c2902146b080035beb19944baf6f014a954720"; + sha256 = "10sjrxvnhrx1bi77lcdn5qz9kww4qcanajqzp2v8d3jlm5p2cc2c"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6588,12 +6588,12 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-07-20"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "9e3916e784660f55f47daa6f26053ad044db5d6a"; - sha256 = "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx"; + rev = "aa1b4c1e05983ff7debd2b4b2788651db099de2f"; + sha256 = "1ray6dk61n1g0vjfvdp9ln98pmf54gjrwrffazfv2gwbwllkj9jf"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6624,12 +6624,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-08-24"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "9c013a6aac6925172e88d2ca17fbd8c1a548560d"; - sha256 = "07cijykmj79hxpkzhmi0hgl0v6cr9fr6f88rc8d9l95rj8s8ck9l"; + rev = "3f1e6d71d4c6c98380d5383d5e1bf1f6eaa3399f"; + sha256 = "18g985bq6r5n36m0043xrdclqrm6dg6p9pz94lrabmqvl2kgda3f"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6648,12 +6648,12 @@ final: prev: nvim-FeMaco-lua = buildVimPluginFrom2Nix { pname = "nvim-FeMaco.lua"; - version = "2023-05-23"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-FeMaco.lua"; - rev = "c06f8befe4b9438aa4f4b763e70d77cabf5093f1"; - sha256 = "04wsbra1hmqv2sv566bn8b0v6ylkz1srzhg4f3017879gdsyipxr"; + rev = "c4e9c71c9ca595772a360435bdf91bee3f9d32b1"; + sha256 = "0ri3bx03vzl9m0q5dbkr85cax2vm1abk1hiiwxzbdmc759p6mxvq"; }; meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; @@ -6996,12 +6996,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-08-17"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "ff22bcc0eccbccf5f7e1a1bc88293299977fc65f"; - sha256 = "1dganblpbfdr2nwbamam5r1fds8ryaqjfzbkh2m2ccdpp8jw2q5f"; + rev = "b93d2c63ed39f76c4fea9348bb0ad3e261e89695"; + sha256 = "00jgq2qiqp6i8mm1vrp3g4g9kvb42yvfr0d37afg97jwkim0k3g5"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7103,24 +7103,24 @@ final: prev: nvim-lilypond-suite = buildVimPluginFrom2Nix { pname = "nvim-lilypond-suite"; - version = "2023-08-18"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "efc1644380a4f0cb3c374841b45930d6ea7c3d40"; - sha256 = "0dxbs90mx4ax5ac4l7lb7l320aamh5lbl0n597lqwj52xdjf88sa"; + rev = "ef1f81f25ac319d87de22fe45100441ad6b24abc"; + sha256 = "1anrqzwjm53mlr5zikawzxsarylc5n6vpa9nna13r88ni349ilda"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-08-24"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "29df35ea2ac5af0f85d8f0f40bddbd7fdaa8c492"; - sha256 = "162lq8vzl2hswjb6pw7315ziskan1walix9fimagvp9qcdv34m28"; + rev = "9b6cb72660114e5f188907be0d866a8ca2b0ef23"; + sha256 = "09j1q2ajav4vxcgd2a5i0i3g72j4y8j7amqx08ss9l9mw7j1lgjc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7367,11 +7367,11 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-08-24"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "25b46b2dd55aa52e78e73d22f48a743eb75cced4"; + rev = "46d0937e5ccf8a71d3f18e4d226864f0ee3e4d1b"; sha256 = "0c84klbi7z94ck3pq3dskaqa6lzzdyyv6cy7a3mclqqckpqmy2g6"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; @@ -7499,24 +7499,24 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-26"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "cb74c1c5aefd8b903f1b547d08d4df42be07aa2a"; - sha256 = "07d935dn0qjqdmr765wa3f6726k4zlmls6rrz6dfjcaj3yp0jj2d"; + rev = "7f6ff292e3f53e7b12554ee92264c23762dc7906"; + sha256 = "0y0z43cnwh5ssrvqrxqmzvhq0nymczxbivjzc3n0dcpk60609j14"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-08-26"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "1786b5019edf476304fe0e2682fed3c73001a8b8"; - sha256 = "0nf7myq1bf58p4kia1dll0jxf56pnd08cqynz5f3z86fm7x2vd2i"; + rev = "3e7c60982c98a9f5e7b6b0fb7c9ba5318f752fe1"; + sha256 = "11wf7fbdbj2sbddkyz1nl5c1ri4d81mmhd9pmj3gds3d61ld6szf"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7559,12 +7559,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-08-24"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e3e2b6de4ccf781fb653a3a1d397aeb4a0095609"; - sha256 = "1458q2a7xvvf12fa7az6gnq7bhnci2czqpazljjqz181pp2wcrl0"; + rev = "bd103502252027434ec42f628d2dbf54821d4ce6"; + sha256 = "030z020v4g140a72mv1q7l6bshhrkgisbd6w3hiwlv9a1mgz4bbc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7690,12 +7690,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2023-08-24"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "44e34d85238e5d964848854ba8b30f986a00ea21"; - sha256 = "1phy6qb7048dklyi17fvw51pxln2r25y37sdx0gwbqfpmy62d0mp"; + rev = "a14f9292b4bd68ceed433fc513f287641816dc6d"; + sha256 = "0rwnmifli01h5aakz440k3g136y3l5f3c16sdvd0k8q4xcdiibs1"; }; meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; @@ -7750,12 +7750,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-08-25"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "3d749d3f2466870bae996c0a2d44f7517b1da2b0"; - sha256 = "11y3vvxq1mi3d6l151hjw24vqzmmpwii1xhi2qqjjicqr2mc09da"; + rev = "d1e52f9b3c755fcebb93d635821663a2c0f53281"; + sha256 = "0gvb7g6844w9ll6w7qwh5ian0vz5sr90nyw7x3pybms8w74wvcrn"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -7883,12 +7883,12 @@ final: prev: openingh-nvim = buildVimPluginFrom2Nix { pname = "openingh.nvim"; - version = "2023-06-19"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "2719e5759ecf4b9a2d492fbf52d03d2e6fc6126a"; - sha256 = "0646wmi4z0yrdrmy96zq5q7f2vl0030scwbh4ywrhwzfk6rjjmxa"; + rev = "27655e19d4cad90f2ceed4f0a08cf7ebfb3a8e40"; + sha256 = "0jl5y6pgwdjin7rcrw8p2xv7x6z8gz9wkn7ijx3ixs5278q8wijb"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; @@ -7907,12 +7907,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-08-24"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6f2e3904c76e946259e130ae7fa9b9e7ec735d73"; - sha256 = "1d9jkyvjaqk8yjg0wk3d3asln6jhj1chrb8bjqhcjdj5k00cwf80"; + rev = "6cbebbdeb4e6e2b76c6dff338c294eb1fc037427"; + sha256 = "17d5ph21di8wl0jivdpnmhv08gjik7h63pkip03a05q5kw59plh8"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8330,12 +8330,12 @@ final: prev: quarto-nvim = buildVimPluginFrom2Nix { pname = "quarto-nvim"; - version = "2023-07-17"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "35f86035e7b3846dbf168267ffe0021c3d312259"; - sha256 = "0a46bqca0f8rqd71kym07nn3vq4qfasw20fhi6s8gywmd658hx9k"; + rev = "93b09591763e6ec7e3c1d5f4594e30bbdf934b46"; + sha256 = "12ymirc0dygsvhavvn53swdfcp7jiswmcq0d57czlq5118nlgwix"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8402,11 +8402,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPluginFrom2Nix { pname = "rainbow-delimiters.nvim"; - version = "2023-08-25"; + version = "2023-08-26"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "f30dd6c58eddca41ed9a9b112aa4be4828939c4d"; - sha256 = "19717p6rqfzkm4hycc1jh70gsidd651pkbd0vp7cdky7mqf59nrb"; + rev = "9cbd3dc409af1f5531778ccd1ea6bce668241f39"; + sha256 = "0qz4my1xw1vww2109s8icscwfysa2aak3kjq2wym2smm259gd8g1"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8809,12 +8809,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-08-25"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "fb2a7ba26ae56961886d0048879dac30e07aca59"; - sha256 = "13rzia4zky9zsjkdv9g1pf57l6z1rkjsrbj7hg8z4ssjz99yrnq0"; + rev = "bd4efc10ab92b83443df06dda7b8ac95d462c2c0"; + sha256 = "0x2xlv49j7g7xhrhkj20qz63xw28mg6zm4wkd26j1j7gb0kgjm97"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9195,12 +9195,12 @@ final: prev: statuscol-nvim = buildVimPluginFrom2Nix { pname = "statuscol.nvim"; - version = "2023-06-20"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "9f1ff2dcf614544c5022e876d83b4894c1944e87"; - sha256 = "1gw8c2aw3s99xxjyh0j62z91g68258gjbz172jh7vkfvqxpbxy3d"; + rev = "0944234914438695050eec6f83b4669864680c1a"; + sha256 = "0ia4s68xwjsr9zrn8h48d5bhpcj3qqvcdwak6pwjvg4hxrq7183p"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -9291,12 +9291,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2023-01-28"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "ce04a8e8c494590382d1b32a20ed3b451d608623"; - sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y"; + rev = "29a5e74bdd4d2958818e15b2926e408c6cd85c75"; + sha256 = "1gqvrrx8lz0pzfkc2rkz2ifpfif278cpklnrn3xvnhfzwbg6j27y"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -9352,12 +9352,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2023-08-16"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "c7a7819af7016d5afb741e425ee65626c36f90d6"; - sha256 = "01a37a0v7n3yq2lpv47mnxr0v8ywvgrz1vs6ckw9qs37awv9fing"; + rev = "e0a20dc4c0e16ca755184c34a27391f31a91e463"; + sha256 = "16bh1wbdvp2zlk2aq5b7xplirqlqg4mwldspapsmahjjh3mdzg8m"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -9569,12 +9569,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2023-08-25"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "5d1a01be63659425c81f29dc56ac77111a1bfb76"; - sha256 = "0mpkrgk2cgsbxsl8n26j4aiynmgspa6a2svbk1vljval9yfihmzc"; + rev = "fbda5d91d6e787f5977787fa4a81da5c8e22160a"; + sha256 = "1cm2jr0f719jhr4q5w8fh0c8qjncrvhck18h4g42xsgyhrkvfy2g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -9630,12 +9630,12 @@ final: prev: telescope-live-grep-args-nvim = buildVimPluginFrom2Nix { pname = "telescope-live-grep-args.nvim"; - version = "2023-04-05"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-live-grep-args.nvim"; - rev = "0f75ea809c46af8997c64f49c52e3c641d887885"; - sha256 = "1dnr5ap329xzx3g6arwz7np1achwihwl2ryd4q5g3r8w1sbm3mbg"; + rev = "851c0997d55601f2afd7290db0f90dc364e29f58"; + sha256 = "0c3hrbrxkcf1qz8djlkmf10fzn34i637sy3ijkdc0ywx1cqr6r1g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; @@ -9799,12 +9799,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-08-26"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "207285ccec21b69996a4d3bcfa59df35d48610e8"; - sha256 = "0x690ic05ndh6h1yrdklx6xljf9grw5brl3i3ki76lcpbg900h9g"; + rev = "32e6792f865221dfaf2a3751fd3cfeac96557433"; + sha256 = "1rbm8sb8cvmvgbcqkiy9j507hh47xvbd5s91j6kiqwng04c5mf63"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9955,12 +9955,12 @@ final: prev: tint-nvim = buildVimPluginFrom2Nix { pname = "tint.nvim"; - version = "2023-05-30"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "levouh"; repo = "tint.nvim"; - rev = "80b15a91087991068d5834419437f652d1d4bc8e"; - sha256 = "14p909q7xlgapgjafpiwd71bf4f83xcrcikn6mlzlnhwrbmxmcns"; + rev = "862835626941d263466754b9c8e2ce2cb004f5ac"; + sha256 = "0m00zy9ihmwh1f28sk92rbrfd3h4azc41zzpy4jbh82gbnq8k4ks"; }; meta.homepage = "https://github.com/levouh/tint.nvim/"; }; @@ -9991,12 +9991,12 @@ final: prev: tmux-nvim = buildVimPluginFrom2Nix { pname = "tmux.nvim"; - version = "2023-05-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9"; - sha256 = "0hr8f385mdr9dpf7fzyf4a2swm7pyrwl64pzihqphccsjwijiwj1"; + rev = "cb12b31a6b8aea1b39e4735ed70f7c73c2a938b0"; + sha256 = "0nv0px0ycg128bddc9z7dchzmfhma9q2gqxbrkh321zsakb2wc9p"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -10052,12 +10052,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-07-13"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "1ee11019f8a81dac989ae1db1a013e3d582e2033"; - sha256 = "0ygrwps4riq37wxwzplw2jyxi7qc7yagypfd444vp0vklqnslvn7"; + rev = "9a01eada39558dc3243278e6805d90e8dff45dc0"; + sha256 = "1rd7d16gqy9g2dixnsk186lqc17a4d1h5c2409s0xi7wzj7czw68"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10124,12 +10124,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-07-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3"; - sha256 = "1i99lvxbr1kmfcz414zg8xdn8n0b1ad9v3hwsbac00xzqhrh1v8i"; + rev = "3f85d8ed30e97ceeddbbcf80224245d347053711"; + sha256 = "0l1mf8mpf2q2wk983baj75hy30dm7hwncbfazrnimycqdyarxn6x"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -10208,12 +10208,12 @@ final: prev: typst-vim = buildVimPluginFrom2Nix { pname = "typst.vim"; - version = "2023-08-17"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "97f21818cb8d3d5ed6bb4b672ddb5af975aab71a"; - sha256 = "048n69wyiv9p8gwbhpcjf6i876v60r11wpv7j7jb2dg8l1m8gp73"; + rev = "555b76ceb3e5d4fbd040e2948646204501ecfdad"; + sha256 = "1r3pbw2pkph4gwpyszk20zv0wd23bb4812ql3f2xh7brzwcglbgi"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10256,12 +10256,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-08-25"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "fc9913f6dfd8fa59a980770fa22e0cb83cf9903a"; - sha256 = "0cj4bb1sbcrb12iz8m3x5gak1isqkr70mz4mlrsxqgx32s1jcjki"; + rev = "a8cc552bad9f6bf5de1d5c62c4aa2d4c270a7541"; + sha256 = "1l4zdj36dsi5vhx7m21wb5kjdn5yljjw526hgc86ws5l1xq1vngb"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11852,12 +11852,12 @@ final: prev: vim-flagship = buildVimPluginFrom2Nix { pname = "vim-flagship"; - version = "2022-04-21"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b"; - sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06"; + rev = "56782f897db49b832a63669ca5398a1923da1371"; + sha256 = "0g40an83b0phkqkn81i80lw3fd6hxcykhy2ajhi580b08ygaw2lq"; }; meta.homepage = "https://github.com/tpope/vim-flagship/"; }; @@ -11888,12 +11888,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2023-07-10"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "bcaeabf89a92a924031d471395054d84bd88ce2f"; - sha256 = "0sf3imx44igw7ih0xah9c2ssqsfjsilk9z4ws6pfv5c4qxz32gn0"; + rev = "3bf0beb10a5a6f7a878195c93711515f2b7bdc99"; + sha256 = "0112kz8mx28sb3hhx4sa8yllajf9jk20d59a32kqb38ccycrqzcb"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -11960,12 +11960,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2023-07-04"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b3b838d690f315a503ec4af8c634bdff3b200aaf"; - sha256 = "1y4jvrja0d77hsr24mb9bfgls5vy12r8g2bmsbsx40zvmwnlh294"; + rev = "572c8510123cbde02e8a1dafcd376c98e1e13f43"; + sha256 = "0kii9kfswyhp7zl5a26n9s3hlqkiyc5zih4yyzxm76sbhi3j00fq"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13103,12 +13103,12 @@ final: prev: vim-merginal = buildVimPluginFrom2Nix { pname = "vim-merginal"; - version = "2022-10-29"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "8ec5976aa4bd647c64504ff535eb06a8b709b051"; - sha256 = "0z43gdgm3vjbq4whwj6dm218fldkjlhp5kwks79w6x6rx84nnj6v"; + rev = "a4becdf09178c3c557b7069252b6df617ff04de3"; + sha256 = "060fcdbscb0984ma9pqjlv4jmrmqks2lmg0jffbw6zzw1fs4c72q"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -13919,12 +13919,12 @@ final: prev: vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2023-06-13"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "8b775e922ebfd198b30d379339dd4a0cfcae4d6f"; - sha256 = "12rn9p5pl7qmimfgfg5ynyfpybildnps86p7q7c1fpvdgr1lyzha"; + rev = "fb29fa044acaca8ce50825b8795d70acf3f604ce"; + sha256 = "1accbzy6hb0jhxqhm21b9d7rr43hfpca1444g1dcy1p2r0i32j72"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; @@ -14267,12 +14267,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2023-07-28"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c1f6a5bdd86f2beceaaf694e34a2587aca76319a"; - sha256 = "0lf3b25c3sx0ykqf7vpqk3wa87x6dsn8c6lbdj7pw9bkqfcw842f"; + rev = "7cfe5ac9f5d5512a7aeeb2e0a13a64975ac129e5"; + sha256 = "1lzvsdzpmrsdacxy73a6jnji3b3rjq3qm1r3qk4l46291xn8b9cw"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14832,12 +14832,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-08-20"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "87283a2358f4aa27735c6ade7d5cb0e24fe03381"; - sha256 = "1kp6hbrg9x9h4gc0bbzpid9kfdyxxvai0nhhg2bpfabzxibw4nyp"; + rev = "e56cd62aeb13681c7c0be86b6b0e99baa157a984"; + sha256 = "1mr08wqr1li1h19xs12s4xidsaiggvizjbvp4za1pkb7gw2hfn6h"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15108,12 +15108,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2023-08-13"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "a98626b2bf88d6fc97a8276d02c75961ce2b35fa"; - sha256 = "0bda58d83p5mv2gribzq9xhqvlrncx1ngc7n5fi67v7k0c6b84r9"; + rev = "0b901c91ed2f18c745d34cf827e03e9d552ca348"; + sha256 = "0di7kllrdpyfnf39pz3zf4m6bqmf2lbr09hd70mpillbdrq2rrh2"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -15324,12 +15324,12 @@ final: prev: vimoutliner = buildVimPluginFrom2Nix { pname = "vimoutliner"; - version = "2021-04-24"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "6d849acb977fc2d008f9cd2edf4f1356537794fe"; - sha256 = "1hy4zgxrc0zn6dnbdv7zy2cn4ny99srsvrgkyvwhg4pzd9rwcqpp"; + rev = "c3efbd58926aec490f5f1e87aa14f63f778f488a"; + sha256 = "0rs0w8x0wckakabz9sv836zgvvlpslvrb4xb049liryabk0w5578"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; @@ -15852,6 +15852,18 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; + otter-nvim = buildVimPluginFrom2Nix { + pname = "otter.nvim"; + version = "2023-08-27"; + src = fetchFromGitHub { + owner = "jmbuhr"; + repo = "otter.nvim"; + rev = "849259c0458a13a1018e7a04e5d30d84e23c2333"; + sha256 = "18rdra1bs51mgs6zk8cdn6yhl2pazkcqf96p5qnp2lhdy6gy6h84"; + }; + meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; + }; + catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; version = "2023-08-25"; @@ -15950,12 +15962,12 @@ final: prev: nvchad-ui = buildVimPluginFrom2Nix { pname = "nvchad-ui"; - version = "2023-08-15"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e973096c282d14d1832d54345ad591048444fb17"; - sha256 = "06bfb9kbwf0cwm87j72zkaa7qnj4ly1q6b5547z8df206f6d3vsq"; + rev = "b3a343e866f1b31d61193ea6e21c417e2e7a5355"; + sha256 = "001d2kfxqb4nb0d5nykv1192cq5aspniv0ljlw710gsya91ym504"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; From 1eb480231778ff22072edc177bdf396f815da68d Mon Sep 17 00:00:00 2001 From: "\"Phillip Cloud\"" <"417981+cpcloud@users.noreply.github.com"> Date: Wed, 30 Aug 2023 05:38:26 -0400 Subject: [PATCH 057/221] vimPlugins: resolve github repository redirects --- .../editors/vim/plugins/generated.nix | 24 +++++++++---------- .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 27be4802a846..6713cd46e5e9 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7929,6 +7929,18 @@ final: prev: meta.homepage = "https://github.com/rgroli/other.nvim/"; }; + otter-nvim = buildVimPluginFrom2Nix { + pname = "otter.nvim"; + version = "2023-08-27"; + src = fetchFromGitHub { + owner = "jmbuhr"; + repo = "otter.nvim"; + rev = "849259c0458a13a1018e7a04e5d30d84e23c2333"; + sha256 = "18rdra1bs51mgs6zk8cdn6yhl2pazkcqf96p5qnp2lhdy6gy6h84"; + }; + meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; + }; + overseer-nvim = buildVimPluginFrom2Nix { pname = "overseer.nvim"; version = "2023-08-23"; @@ -15852,18 +15864,6 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - otter-nvim = buildVimPluginFrom2Nix { - pname = "otter.nvim"; - version = "2023-08-27"; - src = fetchFromGitHub { - owner = "jmbuhr"; - repo = "otter.nvim"; - rev = "849259c0458a13a1018e7a04e5d30d84e23c2333"; - sha256 = "18rdra1bs51mgs6zk8cdn6yhl2pazkcqf96p5qnp2lhdy6gy6h84"; - }; - meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; - }; - catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; version = "2023-08-25"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 79694abd22cb..4c50a22689b3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -665,6 +665,7 @@ https://github.com/Almo7aya/openingh.nvim/,, https://github.com/salkin-mada/openscad.nvim/,HEAD, https://github.com/nvim-orgmode/orgmode/,, https://github.com/rgroli/other.nvim/,HEAD, +https://github.com/jmbuhr/otter.nvim/,, https://github.com/stevearc/overseer.nvim/,HEAD, https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/vuki656/package-info.nvim/,, From 17beb37901dadbcb9802bd61f496ed982ddf63d9 Mon Sep 17 00:00:00 2001 From: "\"Phillip Cloud\"" <"417981+cpcloud@users.noreply.github.com"> Date: Wed, 30 Aug 2023 05:38:44 -0400 Subject: [PATCH 058/221] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 0b59ddf5069d..e93147e5351d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -5,12 +5,12 @@ { ada = buildGrammar { language = "ada"; - version = "0.0.0+rev=f67bc66"; + version = "0.0.0+rev=0f572c4"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "f67bc6622a9b9bc879b2808164abdbaf99d65d4a"; - hash = "sha256-jgTHVUC3b0i2k/foNaEZ3UKVkfREUF4oIZ3QIVBbvy0="; + rev = "0f572c4dccac8cd6a149bbc88c9d8423e9c71ce9"; + hash = "sha256-LNpzqyafrh1JKj0VXaq3Hf3IZHqM1UcUAXy2xVXeSEQ="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; @@ -60,12 +60,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=a7be575"; + version = "0.0.0+rev=4798bc6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "a7be575f17ff9d5340dfd0f60e466cd92a7501d5"; - hash = "sha256-fBQs+HDite1OoHJexqMKRoRpG2fD1YMK739RbmwCgYo="; + rev = "4798bc61410fcb3ae725bab24f96f5c4684cea71"; + hash = "sha256-VHzmBJc9Y3T0jRnOLDJEDVsC/ufGTryWzz/uxgHX2ck="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -403,12 +403,12 @@ }; doxygen = buildGrammar { language = "doxygen"; - version = "0.0.0+rev=1928411"; + version = "0.0.0+rev=7ac6203"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-doxygen"; - rev = "19284113dbd42263c13b39d81b2a3b2492022c9b"; - hash = "sha256-DzD/3c/zErauG0y8MKymeUXMuoFWkF2OzKY93Ap9Fp4="; + rev = "7ac6203cc018ff440b45b6d5aeba596f02eec4d5"; + hash = "sha256-QgmbdB9byVxLpsKB+FaQyyqUO8YuTfnYSTP9hDj5OOU="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen"; }; @@ -680,12 +680,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=8302c98"; + version = "0.0.0+rev=a59aadf"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "8302c98ed78128b22f946fadefaf4af5ba5d5850"; - hash = "sha256-rWNReuod+P7/Wq+zJoJNo9tWLLpo9Xu7B5MYxjWdp0I="; + rev = "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a"; + hash = "sha256-HZJGKJ5KGcNIW6VEKHZLi9ai2bhklCNlbYAyz232+Ek="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -801,12 +801,12 @@ }; hack = buildGrammar { language = "hack"; - version = "0.0.0+rev=2887d39"; + version = "0.0.0+rev=fca1e29"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; - rev = "2887d3927c5fadebfd71c604922d0c59748e9901"; - hash = "sha256-rScvFdoyv0odnAcoKhS+iBaBziV/uaKJa51zPnxMBFQ="; + rev = "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"; + hash = "sha256-XTcsqCvlwbAAi7/TXrYX8wT56Ie+0OW5+eNRMH7XNyk="; }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; @@ -988,12 +988,12 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=38be6ec"; + version = "0.0.0+rev=ca4afaa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "38be6eccc1b86d6ec5dca0976659e807fd4dc28d"; - hash = "sha256-0kOLAVsrCUfpU8sZGRVrr+D3bGWj8bH2qce/ygrIw2w="; + rev = "ca4afaaa41dd7735b35edc0a77629cf932e95799"; + hash = "sha256-b87WFvpboNcQUt3W7tbsfkxzIfc27D0djBgMiF68/EA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; @@ -1798,12 +1798,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=39eaeb4"; + version = "0.0.0+rev=17a6b15"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "39eaeb41e17572c17e35bb050d6bf2da17568dbf"; - hash = "sha256-2WPL7ap2fHEi0+pNnJlHLxKBqPrHsve+DzJSCqw/gpw="; + rev = "17a6b15562b09db1f27b8f5f26f17edbb2aac097"; + hash = "sha256-seWoMuA87ZWCq3mUXopVeDCcTxX/Bh+B4PFLVa0CBQA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2077,12 +2077,12 @@ }; tiger = buildGrammar { language = "tiger"; - version = "0.0.0+rev=4a09924"; + version = "0.0.0+rev=a7f11d9"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; - rev = "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3"; - hash = "sha256-y3bpfBPwvkFNMl1qZtlnpVhi5nnOqo0K9XGS2bCWPmY="; + rev = "a7f11d946b44244f71df41d2a78af0665d618dae"; + hash = "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger"; }; @@ -2312,12 +2312,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=2b2aa81"; + version = "0.0.0+rev=915f263"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "2b2aa817bef5f56c56c8a0d02961858dd47c5860"; - hash = "sha256-aMB6n0GfYap+Damt27Xuwom2qhX/seyuE6YHqnY211M="; + rev = "915f263722a6a74e5a30be82310d3843ed203058"; + hash = "sha256-wUYw3RS0brNbdFcb3ojs6gkrxBuOdRquTEmHTwAzc8w="; }; location = "libs/tree-sitter-wing"; generate = true; From 7e72ee73d5f13af349ddc0be9bc8841a38e7db2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 15:45:17 +0200 Subject: [PATCH 059/221] python311Packages.apischema: init at 0.18.0 --- .../python-modules/apischema/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/apischema/default.nix diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix new file mode 100644 index 000000000000..a60b97d1d951 --- /dev/null +++ b/pkgs/development/python-modules/apischema/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, graphql-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "apischema"; + version = "0.18.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wyfo"; + repo = "apischema"; + rev = "refs/tags/v${version}"; + hash = "sha256-DBFFCLi8cpASyGPNqZvYe3OTLSbNZ8QzaxjQkOiHxFc="; + }; + + passthru.optional-dependencies = { + graphql = [ + graphql-core + ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "apischema" + ]; + + meta = with lib; { + description = "JSON (de)serialization, GraphQL and JSON schema generation using typing"; + homepage = "https://github.com/wyfo/apischema"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 446eccfa1955..aed36f89b540 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -580,6 +580,8 @@ self: super: with self; { apipkg = callPackage ../development/python-modules/apipkg { }; + apischema = callPackage ../development/python-modules/apischema { }; + apispec = callPackage ../development/python-modules/apispec { }; apispec-webframeworks = callPackage ../development/python-modules/apispec-webframeworks { }; From c8dc93df2bb379e3df791c6cdec9dbe26e622741 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 15:48:40 +0200 Subject: [PATCH 060/221] python311Packages.pydrawise: init at 2023.8.0 --- .../python-modules/pydrawise/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/pydrawise/default.nix diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix new file mode 100644 index 000000000000..4adda6c53ccc --- /dev/null +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -0,0 +1,65 @@ +{ lib +, aiohttp +, aioresponses +, apischema +, buildPythonPackage +, fetchFromGitHub +, freezegun +, gql +, graphql-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, requests +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "pydrawise"; + version = "2023.8.0"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "dknowles2"; + repo = "pydrawise"; + rev = "refs/tags/${version}"; + hash = "sha256-cnQJ0enDgOB66rEZePmfTImFrPNMiXfggATM6hsL+ag="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + apischema + gql + graphql-core + requests + ]; + + nativeCheckInputs = [ + aioresponses + freezegun + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pydrawise" + ]; + + meta = with lib; { + description = "Library for interacting with Hydrawise sprinkler controllers through the GraphQL API"; + homepage = "https://github.com/dknowles2/pydrawise"; + changelog = "https://github.com/dknowles2/pydrawise/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aed36f89b540..73bc5f5b4744 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8972,6 +8972,8 @@ self: super: with self; { inherit (pkgs) graphviz; }; + pydrawise = callPackage ../development/python-modules/pydrawise { }; + pydrive2 = callPackage ../development/python-modules/pydrive2 { }; pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { }; From d5d1afa6c35c02e66e9df80cee7e1e9ac25af27a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 13:53:07 +0000 Subject: [PATCH 061/221] mill: 0.11.1 -> 0.11.2 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index ff38657334da..59ceeb8761a6 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-qG+Ddn0BHUZX1VX5hO84exgRz8YuUgYF/fH6MmgkrXE"; + hash = "sha256-7RYMj/vfyzBQhZUpWzEaZYN27ZhYCRyKhQUhlH8tE0U="; }; nativeBuildInputs = [ makeWrapper ]; From 9bf8e19e02bf98c5c14664bae9aea67c8f1309eb Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 30 Aug 2023 15:54:34 +0200 Subject: [PATCH 062/221] grafana-agent: fix building of go-modules.drv from scratch Unbreaks building the go-modules.drv from source (read: not substituted from cache.nixos.org). Regression from cc4dcc08be45ee7889e99a4015a6523e641e6e65 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 0dd4234e9fcb..808a999f37de 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -70,6 +70,12 @@ buildGoModule rec { popd ''; + # do not pass preBuild to go-modules.drv, as it would otherwise fail to build. + # but even if it would work, it simply isn't needed in that scope. + overrideModAttrs = (_: { + preBuild = null; + }); + # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]); From 1aecfb2564bc47d1d4617620efd2b17ad6a59017 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 30 Aug 2023 16:01:09 +0200 Subject: [PATCH 063/221] grafana-agent: 0.35.4 -> 0.36.0 https://github.com/grafana/agent/releases/tag/v0.36.0 https://github.com/grafana/agent/blob/v0.36.0/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.35.4...v0.36.0 --- pkgs/servers/monitoring/grafana-agent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 808a999f37de..620d3aebc4a1 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -14,21 +14,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.35.4"; + version = "0.36.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-3pUKqmqnRm3/e/fhAV5cq16wcK/f7KWb3aoFbPXCC3o="; + hash = "sha256-YUEla8VvLi0H0Utu0vQNqSbZH8C9BeF8BGWRb2R61P8="; }; - vendorHash = "sha256-vzrp20Mg6AA0h3+5+qbKRa7nhx/hgiIHG6RNXLATpHE="; + vendorHash = "sha256-Si7qZYq23XlWFPp+C5qIJw7n0Zk/Rx+yo643m+gSRcg="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/web/ui/yarn.lock"; - hash = "sha256-xJEPubIDjlZQL70UGha1MHbeek6KFPaxZGb5IRgMlTA="; + hash = "sha256-sUFxuliLupGEJY1xFA2V4W2gwHxtUgst3Vrywh1owAo="; }; ldflags = let From 1f6f0bec63bd25ef87563d528568eb9368199752 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 16:04:16 +0200 Subject: [PATCH 064/221] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 230cc2f91681..6d4965a63fc2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1822,7 +1822,8 @@ pygti ]; "hydrawise" = ps: with ps; [ - ]; # missing inputs: pydrawise + pydrawise + ]; "hyperion" = ps: with ps; [ hyperion-py ]; From a6a80686c52ad0a359114f9f5afbf71a7f899b27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 14:04:16 +0000 Subject: [PATCH 065/221] hop-cli: 0.2.52 -> 0.2.53 --- pkgs/tools/admin/hop-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/hop-cli/default.nix b/pkgs/tools/admin/hop-cli/default.nix index eea6a9e73661..794b5be90ef4 100644 --- a/pkgs/tools/admin/hop-cli/default.nix +++ b/pkgs/tools/admin/hop-cli/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hop-cli"; - version = "0.2.52"; + version = "0.2.53"; src = fetchFromGitHub { owner = "hopinc"; repo = "cli"; rev = "v${version}"; - hash = "sha256-xuOkW5jetl+8obeFJnbkVZa+wYWfTNiTOmcrzC8+wGE="; + hash = "sha256-DyM8OEgO2OtD/PD/I6Ys2Yg0gQMB21OnjFdDkWKw+Io="; }; - cargoHash = "sha256-ePUlw4UzsQ2lNuJ5g5OAYh6nKTIoHdDMb34Jzuqtas8="; + cargoHash = "sha256-R6Dbje6OEndJxyWJ8cR/QcfdIBw88Vfbve+EYGozWNc="; nativeBuildInputs = [ pkg-config From b10f5d737285b2fbdb4a3755fd6b5b2e5d98fe02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 14:07:16 +0000 Subject: [PATCH 066/221] ginkgo: 2.11.0 -> 2.12.0 --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 3e0080332e18..0b5b542ca07f 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-0BnvIGqAm1N4xbZiqq/iouXkvDWfpZvBA0gKMcB+WYU="; + sha256 = "sha256-ikZ3vuoGYCbjvcpqol11WZ1PfxqSm1VNfdLDJIlNeP0="; }; - vendorHash = "sha256-jpCib0bwb5MtaHhM+d3dFxIXwyMGvxdo+Vgv6PKVp7w="; + vendorHash = "sha256-huXVFvSd2KkNqb6BWsTY2megnD9dJLy7edX2mGBv0rU="; # integration tests expect more file changes # types tests are missing CodeLocation From d6a9856b3bae7a77c2db59d6bd2ef36ee908652f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 30 Aug 2023 21:46:27 +0800 Subject: [PATCH 067/221] xfce.xfce4-whiskermenu-plugin: 2.7.3 -> 2.8.0 https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/compare/v2.7.3...v2.8.0 Replaced popup script with executable: https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/commit/5ea01727ea6d2b4d3af8eee93a0f0ac7a448f546 --- .../xfce4-whiskermenu-plugin/default.nix | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 3c838df59303..1c0cd3f1474d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,26 +1,44 @@ -{ lib, mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation +, lib +, cmake +, accountsservice +, exo +, garcon +, gettext +, glib +, gtk-layer-shell +, gtk3 +, libxfce4ui +, libxfce4util +, xfce4-panel +, xfconf +}: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.7.3"; + version = "2.8.0"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-F2mp3b1HBvI2lvwGzuE9QsqotLWgsP0NRyORrTV9FJs="; + sha256 = "sha256-5ojcIOVIa9WKL2e6iZwRgrAINSM8750zciCwpn9vzJU="; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; - - postPatch = '' - substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \ - --replace gettext ${gettext}/bin/gettext - ''; - - postInstall = '' - substituteInPlace $out/bin/xfce4-popup-whiskermenu \ - --replace $out/bin/xfce4-panel ${xfce4-panel.out}/bin/xfce4-panel - ''; + buildInputs = [ + accountsservice + exo + garcon + gettext + glib + gtk-layer-shell + gtk3 + libxfce4ui + libxfce4util + xfce4-panel + xfconf + ]; meta = with lib; { description = "Alternate application launcher for Xfce"; From 68cdab7673dd2daafe9a06db8faecde111dd7060 Mon Sep 17 00:00:00 2001 From: budimanjojo Date: Wed, 30 Aug 2023 21:50:14 +0700 Subject: [PATCH 068/221] talosctl: 1.5.0 -> 1.5.1 --- pkgs/applications/networking/cluster/talosctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 258d1777fcc4..05a4382001d5 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-cCH20c0QO3Y1XUcI2RLD611L3GVgxwLRvBeT/+NIlHo="; + hash = "sha256-HYIk1oZbtcnHLap+4AMwoQN0k44zjiiwDzGcNW+9qqM="; }; - vendorHash = "sha256-h7llw2CPrQmcLwMZX1B9XjgF0E3ygc3tCSEsjpRuAYk="; + vendorHash = "sha256-Aefwa8zdKWV9TE9rwNA4pzKZekTurkD0pTDm3QfKdUQ="; ldflags = [ "-s" "-w" ]; From abb1efd2a4157e16da58cd55857ee5b169d3baad Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 30 Aug 2023 09:26:44 -0600 Subject: [PATCH 069/221] matrix-synapse: 1.90.0 -> 1.91.0 https://github.com/matrix-org/synapse/releases/tag/v1.91.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index adf8063f4251..c91069c722bc 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -16,20 +16,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.90.0"; + version = "1.91.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-VUbEERQ/UFCroSiz8Y8EsjB+uhFQXLAsK52kM6HTjjY="; + hash = "sha256-rLEewCN8OdZ4wIWQRbLkxVF/VOAESTLAVQLfUu/PYsA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-t65rvhkLryzba6eZH1thBMzV7y0y5XMbdbrTxC91blQ="; + hash = "sha256-aOoSvT6e2x7JcXoQ2sVTCDvkWupixLzpbk3cTHVQs7I="; }; postPatch = '' From 8b41f813f4af7c66d24f5bb94bc55426cdecfe5e Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 30 Aug 2023 11:37:55 -0400 Subject: [PATCH 070/221] typst-lsp: 0.9.4 -> 0.9.5 Diff: https://github.com/nvarner/typst-lsp/compare/v0.9.4...v0.9.5 Changelog: https://github.com/nvarner/typst-lsp/releases/tag/v0.9.5 --- .../language-servers/typst-lsp/Cargo.lock | 327 ++++++++++-------- .../language-servers/typst-lsp/default.nix | 12 +- .../typst-lsp/update-typstfmt.patch | 22 ++ 3 files changed, 222 insertions(+), 139 deletions(-) create mode 100644 pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch diff --git a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock index 45443db84b5b..0432ef322588 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock +++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -102,7 +102,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -131,9 +131,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -202,23 +202,33 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" dependencies = [ "serde", ] [[package]] name = "bpaf" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c359c5e742f51d3238e83af24b289903591fbce38990eb9fcc903c7f8d5d95f9" +checksum = "1dc3b1bd654a8d16eea03586c3eee8ffd25c7f242b9eae9730cc442834fe56d9" dependencies = [ "owo-colors", "supports-color", ] +[[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -251,9 +261,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -313,7 +323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" dependencies = [ "comemo-macros", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -463,9 +473,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "9b101bb8960ab42ada6ae98eb82afcea4452294294c45b681295af26610d6d28" dependencies = [ "cfg-if", "hashbrown 0.14.0", @@ -482,9 +492,9 @@ checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" [[package]] name = "dirs" @@ -515,14 +525,14 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "ecow" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c5051925c54d9a42c8652313b5358a7432eed209466b443ed5220431243a14" +checksum = "1d1990d053cf6edf3f030682dba3b0eb65ef01fabb2686072765d8a17d6728e8" dependencies = [ "serde", ] @@ -544,9 +554,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -561,7 +571,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -661,9 +671,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -801,7 +811,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -859,15 +869,39 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "globmatch" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0e82f77d5e36ce0c3941a39a6d8fff8ed9553ae13586b31640d6885f7376097" +dependencies = [ + "globset", + "log", + "walkdir", +] + +[[package]] +name = "globset" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -969,9 +1003,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -1309,6 +1343,15 @@ dependencies = [ "phf", ] +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.11.0" @@ -1436,9 +1479,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-types" @@ -1542,9 +1585,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1600,9 +1643,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -1645,7 +1688,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -1745,7 +1788,7 @@ dependencies = [ "futures-util", "once_cell", "opentelemetry_api", - "ordered-float 3.7.0", + "ordered-float 3.9.1", "percent-encoding", "rand", "regex", @@ -1771,9 +1814,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.7.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" +checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" dependencies = [ "num-traits", ] @@ -1851,7 +1894,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -1877,14 +1920,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1923,9 +1966,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2028,9 +2071,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2153,9 +2196,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ "base64", "bytes", @@ -2245,7 +2288,7 @@ dependencies = [ "log", "roxmltree", "simplecss", - "siphasher", + "siphasher 0.3.11", "svgtypes", ] @@ -2270,7 +2313,7 @@ version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -2300,9 +2343,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -2401,29 +2444,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.183" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2438,7 +2481,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2500,15 +2543,21 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2643,7 +2692,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2681,7 +2730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed4b0611e7f3277f68c0fa18e385d9e2d26923691379690039548f867cef02a7" dependencies = [ "kurbo", - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -2697,9 +2746,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -2747,9 +2796,9 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand 2.0.0", @@ -2760,22 +2809,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -2823,9 +2872,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ "deranged", "itoa", @@ -2842,9 +2891,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -2903,9 +2952,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ "backtrace", "bytes", @@ -2926,7 +2975,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3074,7 +3123,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3104,7 +3153,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3186,7 +3235,7 @@ name = "typst" version = "0.7.0" source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "bytemuck", "comemo", "ecow", @@ -3206,7 +3255,7 @@ dependencies = [ "roxmltree", "rustybuzz", "serde", - "siphasher", + "siphasher 0.3.11", "stacker", "subsetter", "svg2pdf", @@ -3267,7 +3316,7 @@ dependencies = [ [[package]] name = "typst-lsp" -version = "0.9.4" +version = "0.9.5" dependencies = [ "anyhow", "async-compression", @@ -3281,7 +3330,7 @@ dependencies = [ "if_chain", "indexmap 2.0.0", "internment", - "itertools", + "itertools 0.11.0", "lazy_static", "memmap2 0.7.1", "once_cell", @@ -3294,7 +3343,7 @@ dependencies = [ "same-file", "serde", "serde_json", - "siphasher", + "siphasher 1.0.0", "strum 0.25.0", "temp-dir", "thiserror", @@ -3307,6 +3356,7 @@ dependencies = [ "tracing-subscriber", "typst", "typst-library", + "typstfmt_lib", "walkdir", ] @@ -3318,7 +3368,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", ] [[package]] @@ -3337,6 +3387,21 @@ dependencies = [ "unscanny", ] +[[package]] +name = "typstfmt_lib" +version = "0.2.0" +source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" +dependencies = [ + "globmatch", + "itertools 0.10.5", + "regex", + "serde", + "toml", + "tracing", + "typst-syntax", + "unicode-segmentation", +] + [[package]] name = "unic-langid" version = "0.9.1" @@ -3590,7 +3655,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -3624,7 +3689,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3637,9 +3702,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -3658,24 +3723,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "weezl" @@ -3734,9 +3786,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -3749,62 +3801,63 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.6" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50be2474cf85af7994b8ddd153dcde06fbcf847ced8f14d2e401ac3c33df143c" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys", ] [[package]] diff --git a/pkgs/development/tools/language-servers/typst-lsp/default.nix b/pkgs/development/tools/language-servers/typst-lsp/default.nix index e6f20062d39f..7abe4811ba37 100644 --- a/pkgs/development/tools/language-servers/typst-lsp/default.nix +++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix @@ -7,22 +7,30 @@ rustPlatform.buildRustPackage rec { pname = "typst-lsp"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "nvarner"; repo = "typst-lsp"; rev = "v${version}"; - hash = "sha256-qbmNZFXg+XaDkHdBA3dU0ICKovEQrl7AAcMkElMLbMA="; + hash = "sha256-rV7vzI4PPyBJX/ofVCXnXd8eH6+UkGaAL7PwhP71t0k="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg="; + "typstfmt_lib-0.2.0" = "sha256-DOh7WQowJXTxI9GDXfy73hvr3J+VcDqSDaClLlUpMsM="; }; }; + patches = [ + # update typstfmt to symlink its README.md into the library crate + # without this patch, typst-lsp fails to build when dependencies are vendored + # https://github.com/astrale-sharp/typstfmt/pull/81 + ./update-typstfmt.patch + ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch b/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch new file mode 100644 index 000000000000..4c540b8257ce --- /dev/null +++ b/pkgs/development/tools/language-servers/typst-lsp/update-typstfmt.patch @@ -0,0 +1,22 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3390,7 +3390,7 @@ dependencies = [ + [[package]] + name = "typstfmt_lib" + version = "0.2.0" +-source = "git+https://github.com/astrale-sharp/typstfmt?rev=cf0ac91#cf0ac9189a4a2d47f4bc833f2538dca032534455" ++source = "git+https://github.com/astrale-sharp/typstfmt?rev=45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880#45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" + dependencies = [ + "globmatch", + "itertools 0.10.5", +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -70,7 +70,7 @@ tracing-subscriber = { version = "0.3.17", default-features = false, features = + "fmt", + ] } + walkdir = "2.3" +-typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "cf0ac91" } ++typstfmt_lib = { git = "https://github.com/astrale-sharp/typstfmt", rev = "45d1ebb6073312d21ce8b4f5dd59b76cfdbe0880" } + + # jaeger + opentelemetry = { version = "0.20.0", optional = true } From 8028a9ffba57c817f0c612502657c656d0518ae6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 15:47:51 +0000 Subject: [PATCH 071/221] plog: 1.1.9 -> 1.1.10 --- pkgs/development/libraries/plog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/plog/default.nix b/pkgs/development/libraries/plog/default.nix index 789502283b7f..45b0fa49a1ab 100644 --- a/pkgs/development/libraries/plog/default.nix +++ b/pkgs/development/libraries/plog/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "plog"; - version = "1.1.9"; + version = "1.1.10"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "SergiusTheBest"; repo = pname; rev = version; - hash = "sha256-CARTr1EEqXNJtp6XwHhr7aiRBiYR0cClzexpNCMaQJc="; + hash = "sha256-NZphrg9OB1FTY2ifu76AXeCyGwW2a2BkxMGjZPf4uM8="; }; strictDeps = true; From 57b7681f02899478b6c752c31bc8188dd77b9349 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 16:01:24 +0000 Subject: [PATCH 072/221] victoriametrics: 1.93.0 -> 1.93.1 --- pkgs/servers/nosql/victoriametrics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 01fa9a38be8d..7a6fa51dea75 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.93.0"; + version = "1.93.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-NkpMGsNz4knt5QY6B9sPJ3GcXEgPNyNgAsNBs9F2GOQ="; + hash = "sha256-52OY4sZ2UI+p6+QYkRW8Ov9SbLPKmvgvgV7rhfo0tAY="; }; vendorHash = null; From 8e5ebfee3685efdd4b2dfbce5dfadc85bfcf3afe Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Wed, 30 Aug 2023 18:03:27 +0200 Subject: [PATCH 073/221] dasel: 2.3.5 -> 2.3.6 --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index c01cc4d67c0f..312e75e3b0a0 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-O2v4VsrE4DyGJQN7ggaqMkZxFstDrhyQCFaEdrB3sTY="; + sha256 = "sha256-k+I4n05IbQT7tGzkJ0aPW6kLT1mGqwQOwoKDyal8L3w="; }; vendorHash = "sha256-Gueo8aZS5N1rLqZweXjXv7BLrtShxGDSGfbkYXhy4DQ="; From 3d6df828a2d38bb10034cf9f58ceae58ae621af3 Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Wed, 30 Aug 2023 21:43:03 +0530 Subject: [PATCH 074/221] gcov2lcov: init at 1.0.6 --- pkgs/development/tools/gcov2lcov/default.nix | 31 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/gcov2lcov/default.nix diff --git a/pkgs/development/tools/gcov2lcov/default.nix b/pkgs/development/tools/gcov2lcov/default.nix new file mode 100644 index 000000000000..5ee3476eac2c --- /dev/null +++ b/pkgs/development/tools/gcov2lcov/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gcov2lcov"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "jandelgado"; + repo = "gcov2lcov"; + rev = "v${version}"; + hash = "sha256-S5fAhd0bh1XEeQwaya8LvnKQ/iz4PjAbpjK4uFI6H1g="; + }; + + vendorHash = "sha256-r95PFkTywGiDIEnDfLpzt97SkuDeXo4xg2N7ikG0hs0="; + + ldflags = [ "-s" "-w" ]; + + # Some checks depend on looking up vcs root + checkPhase = false; + + meta = with lib; { + description = "Convert go coverage files to lcov format"; + homepage = "https://github.com/jandelgado/gcov2lcov"; + changelog = "https://github.com/jandelgado/gcov2lcov/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ meain ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3b19bc78c9..4878aeea0ea1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28519,6 +28519,8 @@ with pkgs; gci = callPackage ../development/tools/gci { }; + gcov2lcov = callPackage ../development/tools/gcov2lcov { }; + ginkgo = callPackage ../development/tools/ginkgo { }; gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { From 051f64fab8e3fedcea605a89070f2d4155d1a89e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 16:38:56 +0000 Subject: [PATCH 075/221] lima-bin: 0.17.0 -> 0.17.2 --- pkgs/applications/virtualization/lima/bin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index fab9d6b68017..198ab370b613 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.17.0"; + version = "0.17.2"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "c1b6cd12d13a67918be0f85c1036c2fbc894ef91707cbb9a8c346c0cb371a4e5"; + sha256 = "c7e328369e6842b15452b440daa5137e00da57ca7aa025b1cf7f80bd5c7843a9"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "cecefed3ae3aadc25b591973db51f89278589cb53605b17282b8afb7c38febab"; + sha256 = "5b8954b3040b82016701091bed4ac99c668ffb8d362dc7a0fdf5cb9a6ed9ebb1"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "b07fc3af272b7e86ea913a91722f46a8bc6361d74c2db9ca097c88852e444f1d"; + sha256 = "20df104067f255212cd6df82508961b20bf4c0a16a233a74d495a4b6ee3a62e8"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "1e455d4d1a213db2521aba3b1d282fcee70e5e42482f32177488539e8b35c103"; + sha256 = "a9af3aec848ed7bc490baff2f1d785334cbbc6cd94f981705cc0aeab833288b0"; }; }; in From 82324b5a7cf0a319fc073031a54d6fb786566897 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 16:44:36 +0000 Subject: [PATCH 076/221] wlr-which-key: 0.1.0 -> 0.1.1 --- pkgs/tools/wayland/wlr-which-key/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/wlr-which-key/default.nix b/pkgs/tools/wayland/wlr-which-key/default.nix index 470242871c78..d333f1525402 100644 --- a/pkgs/tools/wayland/wlr-which-key/default.nix +++ b/pkgs/tools/wayland/wlr-which-key/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "wlr-which-key"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "wlr-which-key"; rev = "v${version}"; - hash = "sha256-GLTbUa5EfpJV7OACTlewAgGjd5Ub0fYHoW8f+EVrT14="; + hash = "sha256-FVpPS5EQ6+xZIBtdS18SdVx0TK9/ikryU9mtm5JvDgk="; }; - cargoHash = "sha256-TtA4Ley5bwymF8Yiqso5fGAwGsT0GRlfAlGS5j4s0Qw="; + cargoHash = "sha256-JELvmG2CiknBP3QbaXSl1uj6wEgLaDFVFBuS1l5SUk4="; nativeBuildInputs = [ pkg-config From 4276592b0b1c9fe4c0c6acc2aa139bfaa176645f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 17:04:17 +0000 Subject: [PATCH 077/221] kubernetes-polaris: 8.4.0 -> 8.5.0 --- pkgs/tools/security/kubernetes-polaris/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/tools/security/kubernetes-polaris/default.nix index 18f00ed756bb..a5640e87fb8c 100644 --- a/pkgs/tools/security/kubernetes-polaris/default.nix +++ b/pkgs/tools/security/kubernetes-polaris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubernetes-polaris"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "polaris"; rev = version; - sha256 = "sha256-r1SUYz71IXgqWTYtZlk+OjlYHSfJ8nOK2/YFOoIESMw="; + sha256 = "sha256-Xn3NZxZ2aMEgI8XnrPNjNkt8aTQ95brYcdJO2ba3L14="; }; - vendorHash = "sha256-K9QvA4WNF61iToPze26OwP78HKseuajnsHzmWdoo7Y4="; + vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk="; nativeBuildInputs = [ installShellFiles ]; From ee577cc88b7bff051b2b65c225578fd6759d13b0 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 30 Aug 2023 13:05:07 -0400 Subject: [PATCH 078/221] python310Packages.universal-pathlib: 0.1.2 -> 0.1.3 Changelog: https://github.com/fsspec/universal_pathlib/releases/tag/v0.1.3 --- .../python-modules/universal-pathlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index a12bb7dfac20..966e9c459d86 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , setuptools , setuptools-scm , fsspec -, pythonOlder }: buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-aJ4nAf717U7RmIjQrKCzVC/iSOCbEK3EMfX3R/hoBSo="; + hash = "sha256-GgUqteBRcwHfZr5lF+n+Y82fwAgT5c5xpzcBRBrCtcg="; }; nativeBuildInputs = [ From 87201d37f3b7ebffbbda3adf303733801adc5e7e Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 06:57:12 -0700 Subject: [PATCH 079/221] python310Packages.scikit-fuzzy: fix tests for numpy 1.25 --- .../python-modules/scikit-fuzzy/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix index dbb5d2044e21..354c27f01915 100644 --- a/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , matplotlib , networkx , nose @@ -24,12 +25,28 @@ buildPythonPackage rec { hash = "sha256-kS48aHC719wUdc2WcJa9geoMUcLHSj7ZsoRZYAhF2a0="; }; + patches = [ + # https://github.com/scikit-fuzzy/scikit-fuzzy/pull/299 + (fetchpatch { + name = "numpy-1.25-test-compatibility-1.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/d7d114cff002e2edf9361a55cb985615e91797b5.patch"; + hash = "sha256-udF/z94tVGRHq7gcOko4BSkvVnqe/A/bAARfCPrc06M="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-2.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/f1612f6aeff34dc9329dbded7cee098fcd22ffd9.patch"; + hash = "sha256-Le1ECR4+RjWCkfqjVrd471GD7tuVaQlZ7RZd3zvFdHU="; + }) + (fetchpatch { + name = "numpy-1.25-test-compatibility-3.patch"; + url = "https://github.com/scikit-fuzzy/scikit-fuzzy/commit/459b9602cf182b7b42f93aad8bcf3bda6f20bfb5.patch"; + hash = "sha256-gKrhNpGt6XoAlMwQW70OPFZj/ZC8NhQq6dEaBpGE8yY="; + }) + ]; + propagatedBuildInputs = [ networkx numpy scipy ]; nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; - # numpy API breakage: "AttributeError: module 'numpy' has no attribute 'float'" - disabledTests = [ "test_fuzzy_compare" ]; - pythonImportsCheck = [ "skfuzzy" ]; meta = with lib; { From 4bf645d010c7890083b7510263491bb3d99a0947 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 17:27:37 +0000 Subject: [PATCH 080/221] speedtest-go: 1.6.3 -> 1.6.5 --- pkgs/tools/networking/speedtest-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index 680f81dadacc..ead27348c5c6 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "speedtest-go"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xZq7wiD0H6W7BeOQoTkWVmFM1dV24clJUibNaW0lLwk="; + hash = "sha256-nuZKYGumxSzhdbrMQzady1ja3aozzTyOx9cfRTin08w="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; From 803dee581de1e6e37edb2a74da2f6e63961bd235 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 10:28:09 -0700 Subject: [PATCH 081/221] python311Packages.cookies: fetch patch to fix python 3.11 build --- .../python-modules/cookies/default.nix | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix index a4e35dac346a..3f0d64c0c22d 100644 --- a/pkgs/development/python-modules/cookies/default.nix +++ b/pkgs/development/python-modules/cookies/default.nix @@ -1,15 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "cookies"; version = "2.2.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "13pfndz8vbk4p2a44cfbjsypjarkrall71pgc97glk5fiiw9idnn"; + hash = "sha256-1raYeIyuTPpOYu+GQ6nKMyt5vZbLMUKUuGSujX6z7o4="; }; - doCheck = false; + patches = [ + (fetchpatch { + name = "fix-deprecations.patch"; + url = "https://gitlab.com/sashahart/cookies/-/commit/22543d970568d577effe120c5a34636a38aa397b.patch"; + hash = "sha256-8e3haOnbSXlL/ZY4uv6P4+ABBKrsCjbEpsLHaulbIUk="; + }) + ]; + + nativeBuildInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # https://gitlab.com/sashahart/cookies/-/issues/6 + "test_encoding_assumptions" + ]; meta = with lib; { description = "Friendlier RFC 6265-compliant cookie parser/renderer"; From af3e3f1a090854f0c5241f93de99c5e14d792323 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 30 Aug 2023 13:34:26 -0400 Subject: [PATCH 082/221] cargo-dist: 0.1.0 -> 0.2.0 Diff: https://github.com/axodotdev/cargo-dist/compare/v0.1.0...v0.2.0 Changelog: https://github.com/axodotdev/cargo-dist/blob/v0.2.0/CHANGELOG.md --- pkgs/development/tools/rust/cargo-dist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 1c9e073ecdd7..47e62a2c366b 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-yuBf6WgY+sGk7Y5/gZFHeawbHhsVIxabFlpiL4AUzK8="; + hash = "sha256-uHkmwmEVV3+VPvp5WIc+PbwYvhYZHStiMun1yguPelw="; }; - cargoHash = "sha256-vfpSMa3NO95SPU4jSW1qKMUy4EGZloYNC3SyGwlTGC0="; + cargoHash = "sha256-8bgb8CCkoqECyd9CW2OkPQmhqfiIOuelsXhOcm1d9kQ="; nativeBuildInputs = [ pkg-config From 39ab966bc4575ab703336dfa5e444a6da5dfae14 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:10:10 -0700 Subject: [PATCH 083/221] python310Packages.pex: 2.1.144 -> 2.1.145 --- pkgs/development/python-modules/pex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 2491ebb6b851..51f13095ed08 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.144"; - format = "flit"; + version = "2.1.145"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wugHG/ZfyfNgd2znDS7FXu34LsUVMcwDswFkh4lRIXo="; + hash = "sha256-1rrIxOjOdGz+Xxb6QrH6Zth/eF+zaBOGFf4I9P17nbI="; }; nativeBuildInputs = [ From c0578b8128ace1397baac37bb4aa3433162290fb Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sat, 19 Aug 2023 18:52:58 +0200 Subject: [PATCH 084/221] flare-signal: 0.9.1 -> 0.10.0 Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.9.1...0.9.3 Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.9.3/CHANGELOG.md flare-signal: 0.9.3 -> 0.10.0 Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.9.3...0.10.0 Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.10.0/CHANGELOG.md --- .../flare-signal/Cargo.lock | 1127 +++++++++-------- .../flare-signal/default.nix | 13 +- 2 files changed, 641 insertions(+), 499 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 46ac41b3a4aa..085eec078c76 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + [[package]] name = "aead" version = "0.4.3" @@ -42,9 +48,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher 0.4.4", @@ -83,9 +89,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -107,9 +113,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -119,15 +125,15 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ashpd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" dependencies = [ "async-std", "enumflags2", @@ -156,9 +162,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -174,7 +180,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -220,17 +226,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -248,9 +254,9 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.23", "signal-hook", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -261,7 +267,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -298,13 +304,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -337,15 +343,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] @@ -390,10 +396,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake3" -version = "1.3.3" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "blake3" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", @@ -462,11 +474,20 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] +[[package]] +name = "blurhash" +version = "0.1.1" +source = "git+https://github.com/marc0x1/blurhash-rs?branch=pixbuf-patch#c07c0cbcd29b2277e8c1d0f6ae07b2e0fad1ed52" +dependencies = [ + "gdk-pixbuf", + "image 0.23.14", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -493,11 +514,11 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -507,9 +528,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", "libc", @@ -527,18 +548,19 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -634,9 +656,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -656,9 +678,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -673,23 +695,44 @@ dependencies = [ ] [[package]] -name = "crossbeam-epoch" -version = "0.9.14" +name = "crossbeam-channel" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -746,6 +789,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "deflate" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +dependencies = [ + "adler32", + "byteorder", +] + [[package]] name = "derivative" version = "2.2.0" @@ -777,27 +830,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "displaydoc" version = "0.2.4" @@ -806,7 +838,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -817,9 +849,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "enumflags2" @@ -839,7 +871,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -855,6 +887,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "err-derive" version = "0.3.1" @@ -871,13 +909,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -905,6 +943,12 @@ dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "fdeflate" version = "0.3.0" @@ -932,10 +976,11 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.9.1" +version = "0.10.0" dependencies = [ "ashpd", "async-trait", + "blurhash", "env_logger", "err-derive", "futures", @@ -943,9 +988,11 @@ dependencies = [ "gettext-rs", "gtk4", "hex", + "image 0.23.14", "lazy_static", "libadwaita", "libsignal-service", + "libspelling", "log", "once_cell", "oo7", @@ -957,6 +1004,7 @@ dependencies = [ "serde", "serde_json", "sled", + "sourceview5", "tokio", "tracing", "url", @@ -966,12 +1014,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -1059,7 +1107,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1076,7 +1124,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1120,11 +1168,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -1134,9 +1181,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1147,11 +1194,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1163,9 +1209,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1180,9 +1226,9 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa73894ed86fe10157436123d8baae5f2924ebc4fa48a11d8f093e07b9ecbbd" +checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1193,9 +1239,9 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41c5a9cd7e06f612b91ec45ecb423ab57921bbd92f56e46a67b962be198e0c" +checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624" dependencies = [ "glib-sys", "libc", @@ -1204,9 +1250,9 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17de2c3554d5127b9dfacd4d1801e2e3c9163bce01c6e1c407c054e9b771f2ee" +checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1217,9 +1263,9 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ca6c03d5019467d21671936edeba09f908039900af8ce4b834c19646031c72" +checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125" dependencies = [ "gdk4-sys", "glib-sys", @@ -1250,9 +1296,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -1290,18 +1336,27 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.27.3" +name = "gif" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.17.9" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", @@ -1317,9 +1372,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1330,11 +1385,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.9" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -1353,24 +1408,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.9" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck 0.4.1", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "glib-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -1396,9 +1450,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1407,9 +1461,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1418,9 +1472,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1430,11 +1484,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags", "cairo-rs", "gdk4", "glib", @@ -1446,9 +1499,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1462,11 +1515,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags", "cairo-rs", "field-offset", "futures-channel", @@ -1479,15 +1531,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1499,9 +1550,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1518,9 +1569,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "headers" @@ -1529,7 +1580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -1564,18 +1615,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1660,9 +1702,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1672,9 +1714,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1686,7 +1728,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1722,9 +1764,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1755,25 +1797,44 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", + "gif", + "jpeg-decoder", + "num-iter", + "num-rational 0.3.2", "num-traits", - "png", + "png 0.16.8", + "scoped_threadpool", + "tiff", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational 0.4.1", + "num-traits", + "png 0.17.10", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] @@ -1802,21 +1863,20 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", + "hermit-abi", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -1830,9 +1890,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -1844,10 +1904,19 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.63" +name = "jpeg-decoder" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1872,11 +1941,10 @@ dependencies = [ [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags", "gdk-pixbuf", "gdk4", "gio", @@ -1889,9 +1957,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", "gio-sys", @@ -1951,7 +2019,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=3c65765#3c65765e8610790afc419af306aa0c1ac77e72af" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" dependencies = [ "aes 0.7.5", "aes-gcm", @@ -1974,7 +2042,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "thiserror", "url", "uuid", @@ -1984,7 +2052,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=3c65765#3c65765e8610790afc419af306aa0c1ac77e72af" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" dependencies = [ "async-trait", "async-tungstenite", @@ -2007,6 +2075,35 @@ dependencies = [ "url", ] +[[package]] +name = "libspelling" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850363056ea48497686407e7e583c50c793896c151bbe7139ad4ea02fbf15e76" +dependencies = [ + "gio", + "glib", + "gtk4", + "libc", + "libspelling-sys", + "sourceview5", +] + +[[package]] +name = "libspelling-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "377675d9465da676ebc05742743d5e5bc53a49be1138f463583181aea97da3c6" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "sourceview5-sys", + "system-deps", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2019,6 +2116,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + [[package]] name = "locale_config" version = "0.3.0" @@ -2034,9 +2137,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2044,9 +2147,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "value-bag", ] @@ -2083,7 +2186,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "thiserror", "zeroize", ] @@ -2103,15 +2206,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -2143,6 +2237,25 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" +dependencies = [ + "adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2161,7 +2274,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2198,7 +2311,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -2217,23 +2330,23 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", - "num-rational", + "num-rational 0.4.1", "num-traits", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2242,9 +2355,9 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" dependencies = [ "byteorder", "lazy_static", @@ -2260,9 +2373,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -2288,6 +2401,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-rational" version = "0.4.1" @@ -2302,20 +2426,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -2371,9 +2495,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2392,28 +2516,27 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "oo7" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1007a6c292751abc192f8dbeef8341bac074e991be7b0eb27a6aece5ee79b4dd" +checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" dependencies = [ - "aes 0.8.2", + "aes 0.8.3", "async-global-executor", "async-std", "byteorder", "cbc", "cipher 0.4.4", "digest 0.10.7", - "dirs", "futures-util", "hkdf 0.12.3", "hmac 0.12.1", "num", "num-bigint-dig", "once_cell", - "pbkdf2 0.12.1", + "pbkdf2 0.12.2", "rand 0.8.5", "serde", - "sha2 0.10.6", + "sha2 0.10.7", "zbus", "zeroize", ] @@ -2430,12 +2553,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "ordered-stream" version = "0.2.0" @@ -2448,11 +2565,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags", "gio", "glib", "libc", @@ -2462,9 +2578,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -2523,14 +2639,14 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] name = "pbkdf2" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", "hmac 0.12.1", @@ -2544,9 +2660,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", "indexmap", @@ -2574,9 +2690,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2592,15 +2708,27 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "crc32fast", + "deflate", + "miniz_oxide 0.3.7", +] + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -2620,13 +2748,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", "log", "pin-project-lite", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2660,13 +2788,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pqcrypto-internals" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0127cbc0239f585139a56effd7867921eae3425a000a72dde2b0a156062346b2" +checksum = "d9d34bec6abe2283e6de7748b68b292d1ffa2203397e3e71380ff8418a49fb46" dependencies = [ "cc", "dunce", - "getrandom 0.2.9", + "getrandom 0.2.10", "libc", ] @@ -2692,7 +2820,7 @@ checksum = "97e91cb6af081c6daad5fa705f8adb0634c027662052cb3174bdf2957bf07e25" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=9337c5c#9337c5cd9d4c20967eb233d10d8265c58a62b79f" +source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" dependencies = [ "base64 0.12.3", "futures", @@ -2711,7 +2839,7 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=9337c5c#9337c5cd9d4c20967eb233d10d8265c58a62b79f" +source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" dependencies = [ "async-trait", "base64 0.12.3", @@ -2723,7 +2851,7 @@ dependencies = [ "prost-build 0.10.4", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "sled", "thiserror", ] @@ -2886,7 +3014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76" dependencies = [ "html-escape", - "image", + "image 0.24.7", "qrcodegen", ] @@ -2907,9 +3035,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2973,7 +3101,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -2985,13 +3113,35 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3000,25 +3150,14 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.9", - "redox_syscall 0.2.16", - "thiserror", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -3028,9 +3167,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -3093,16 +3232,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys", ] [[package]] @@ -3119,12 +3271,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.2", + "rustls-pemfile 1.0.3", "schannel", "security-framework", ] @@ -3140,39 +3292,45 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] -name = "scopeguard" -version = "1.1.0" +name = "scoped_threadpool" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3186,11 +3344,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3199,9 +3357,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3209,35 +3367,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -3246,20 +3404,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -3314,9 +3472,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -3342,9 +3500,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -3361,15 +3519,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3392,9 +3550,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -3406,6 +3564,51 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "sourceview5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c5f976a113e947bc5ec67758b2960c0db4ca76f80fb410d7cd86cd456d9ee5" +dependencies = [ + "futures-channel", + "futures-core", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "pango", + "sourceview5-sys", +] + +[[package]] +name = "sourceview5-sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29637cccd56075a37ba72c0cc8b8d599dbc1d857e30dadea97eaacbc29b7fd46" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + [[package]] name = "spin" version = "0.5.2" @@ -3437,9 +3640,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3460,9 +3663,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -3473,9 +3676,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-dir" @@ -3485,15 +3688,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -3507,22 +3710,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", +] + +[[package]] +name = "tiff" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" +dependencies = [ + "jpeg-decoder", + "miniz_oxide 0.4.4", + "weezl", ] [[package]] @@ -3542,19 +3756,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3575,7 +3788,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3605,9 +3818,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -3617,18 +3830,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap", "serde", @@ -3658,13 +3871,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3721,9 +3934,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -3736,9 +3949,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -3803,18 +4016,18 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "serde", ] [[package]] name = "value-bag" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" [[package]] name = "version-compare" @@ -3836,11 +4049,10 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -3858,9 +4070,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3868,24 +4080,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -3895,9 +4107,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3905,28 +4117,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -3942,6 +4154,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + [[package]] name = "which" version = "4.4.0" @@ -3990,31 +4208,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-targets", ] [[package]] @@ -4023,128 +4217,71 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -4253,7 +4390,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index 0b8704c092e6..7770eb6af50c 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -7,8 +7,10 @@ , pkg-config , gst_all_1 , protobuf +, libspelling , libsecret , libadwaita +, gtksourceview5 , rustPlatform , rustc , appstream-glib @@ -19,23 +21,24 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = pname; rev = version; - hash = "sha256-RceCVn2OmrHyY2DWT+5XeOc+HlQGVdtOmfo3+2r9hKs="; + hash = "sha256-+9zpYW9xjLe78c2GRL6raFDR5g+R/JWxQzU/ZS+5JtY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { + "blurhash-0.1.1" = "sha256-SLpszTL2CupMAfUQK5KlnsHTIBDB8hbJs1d6DQXaUiA="; "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0="; "libsignal-protocol-0.1.0" = "sha256-VQwrGTNZnlDK5p8ZleAZYtbzDiVTHxc93/CRlCUjWtE="; - "libsignal-service-0.1.0" = "sha256-azXQGC008rcqF2C8yHy5CM2NU1Hvwv2I3Kr8aI6URS8="; - "presage-0.6.0-dev" = "sha256-MNd4CvBv6htZQj2g2a3JcQ1r/kk4UPSBLFezEnRK+60="; + "libsignal-service-0.1.0" = "sha256-1ub0IPSvGhZ2tsC6IolusJ1NSWy+5SXSx8qlIdPngTE="; + "presage-0.6.0-dev" = "sha256-4isKBn/4yHoAYsYbBTULK/veZmaecU7t+PvE4Y0oNgk="; }; }; @@ -53,8 +56,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gtksourceview5 libadwaita libsecret + libspelling protobuf # To reproduce audio messages From ff99e985fd3241fbac902e8b408bf374e4033d7c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 30 Aug 2023 20:51:10 +0200 Subject: [PATCH 085/221] lima-bin: set platforms --- pkgs/applications/virtualization/lima/bin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 198ab370b613..2400c19d40ea 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -108,5 +108,6 @@ stdenvNoCC.mkDerivation { description = "Linux virtual machines (on macOS, in most cases)"; license = licenses.asl20; maintainers = with maintainers; [ tricktron ]; + platforms = platforms.linux ++ platforms.darwin; }; } From 128ebf865db05982f0803538e9da84b8f453cae8 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 30 Aug 2023 07:10:31 -0700 Subject: [PATCH 086/221] python311Packages.aioredis: fetch patch for python 3.11 compatibility --- .../python-modules/aioredis/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 5ea482278944..2c944600ef91 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , async-timeout , typing-extensions @@ -11,14 +12,25 @@ buildPythonPackage rec { pname = "aioredis"; version = "2.0.1"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e"; + hash = "sha256-6qUar5k/LXH1S3BSfEQEN7plNAWIr+t4bNh8Vcic2Y4="; }; + patches = [ + # https://github.com/aio-libs-abandoned/aioredis-py/pull/1490 + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/aio-libs-abandoned/aioredis-py/commit/1b951502dc8f149fa66beafeea40c782f1c5c1d3.patch"; + hash = "sha256-EqkiYktxISg0Rv4ShXOksGvuUyljPxjJsfNOVaaax2o="; + includes = [ "aioredis/exceptions.py" ]; + }) + ]; + propagatedBuildInputs = [ async-timeout typing-extensions @@ -29,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio (PEP 3156) Redis client library"; - homepage = "https://github.com/aio-libs/aioredis"; + homepage = "https://github.com/aio-libs-abandoned/aioredis-py"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; From c6abc73cc4b9899bf1fe05c63b8d34684da1c628 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 30 Aug 2023 21:13:35 +0200 Subject: [PATCH 087/221] pcloud: 1.12.0 -> 1.14.0 --- pkgs/applications/networking/pcloud/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 403d1e0cf341..ff0d808e8f12 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,13 @@ let pname = "pcloud"; - version = "1.12.0"; - code = "XZyc9wVZAbFzyV8ElP71D5v170CvEmVtmrB7"; + version = "1.14.0"; + code = "XZpL8AVZAqfCXz5TebJ2gcvAiHi15pYFKPey"; + # 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-QzBlpF+qtNdSZFv3gU0mQhpVyPTWdGH3c+UHKKGfvKc="; + hash = "sha256-uirj/ASOrJyE728q+SB7zq0O9O58XDNzhokvNyca+2c="; }; appimageContents = appimageTools.extractType2 { From e2979cb3ab6e908b0dc69dedc7c6b15e9d02496a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 19:17:10 +0000 Subject: [PATCH 088/221] trufflehog: 3.54.0 -> 3.54.1 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.54.0...v3.54.1 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.54.1 --- pkgs/tools/security/trufflehog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f0a1284de15a..d5eea9398073 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.54.0"; + version = "3.54.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-JPXzo6f1meLIoRdbKN58Hhl502UjgxPrC8MDoizzUvs="; + hash = "sha256-wHgteAxFCnGY31Yda1qIxy4TLM51Lk+yy2BIHgfIzik="; }; vendorHash = "sha256-zYvKhhwN5TtJQxkkcY5U9LtTdMb97ucfksxpTMKH/Zc="; From aeb2407b53c98521e4c350244886bac4720964c8 Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Wed, 30 Aug 2023 21:43:05 +0200 Subject: [PATCH 089/221] monetdb: 11.47.3 -> 11.47.5 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 7df1d03eef97..09c9bfaa3c44 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.47.3"; + version = "11.47.5"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-0vhcPh4ZXCAKpgiSZstu6vBQv7VwOYc6qoz8dPkugNE="; + hash = "sha256-GuGGs3hAheNYsaiUG7femLhi38c4gB528bruRotOdNE="; }; nativeBuildInputs = [ bison cmake python3 ]; From 7bf7c4049a38847d4bd27be28380b34802ed5bb1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 30 Aug 2023 21:56:24 +0200 Subject: [PATCH 090/221] prismlauncher: include udev as a runtime dependency OSHI might need udev to acquire some information. A recent Minecraft released updated this library, which caused a warning to be printed on launch about this missing dependency. See https://github.com/oshi/oshi/pull/2327 Signed-off-by: Sefa Eyeoglu --- pkgs/games/prismlauncher/wrapper.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 240deec4e2fe..89b0b08c229e 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -16,6 +16,7 @@ , gamemode , flite , mesa-demos +, udev , msaClientID ? null , gamemodeSupport ? stdenv.isLinux @@ -58,11 +59,15 @@ symlinkJoin { libXxf86vm ]) ++ [ + # lwjgl libpulseaudio libGL glfw openal stdenv.cc.cc.lib + + # oshi + udev ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite From cfc653dd7c2c035191f5d07c6800c2288eefbfb7 Mon Sep 17 00:00:00 2001 From: Iwan Briquemont Date: Wed, 30 Aug 2023 22:07:16 +0200 Subject: [PATCH 091/221] jacktrip: 1.5.3 -> 1.10.1 --- pkgs/applications/audio/jacktrip/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index 7dd60a6c4d1b..2046233fcb46 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -12,17 +12,22 @@ , python3 , rtaudio , ninja +, qtquickcontrols2 +, qtnetworkauth +, qtwebsockets +, qtgraphicaleffects }: mkDerivation rec { - version = "1.5.3"; + version = "1.10.1"; pname = "jacktrip"; src = fetchFromGitHub { owner = "jacktrip"; repo = "jacktrip"; rev = "v${version}"; - sha256 = "sha256-sfAYMTnBjT4LkgksyzDGGy97NLX5ljjhNDFioQnTzLs="; + fetchSubmodules = true; + sha256 = "sha256-bdYhyLsdL4LDkCzJiWXdi+7CTtqhSiA7HNYhg190NWs="; }; preConfigure = '' @@ -46,6 +51,10 @@ mkDerivation rec { meson qmake qttools + qtquickcontrols2 + qtnetworkauth + qtwebsockets + qtgraphicaleffects pkg-config ]; From ce472c7f307a72ede764ddcea79ea5fd47e7a1d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 22:45:50 +0200 Subject: [PATCH 092/221] python311Packages.restrictedpython: 6.1 -> 6.2 Changelog: https://github.com/zopefoundation/RestrictedPython/blob/6.2/CHANGES.rst --- pkgs/development/python-modules/restrictedpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 4f1aafbdfa66..875771d8f8c6 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "restrictedpython"; - version = "6.1"; + version = "6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "RestrictedPython"; inherit version; - hash = "sha256-fljqFcySoLkW4MjKKV6LLG1A/uTRLhorUGPYbvwnmpw="; + hash = "sha256-23Prfjs5ZQ8NIdEMyN2pwOKYbmIclLDF3jL7De46CK8="; }; nativeCheckInputs = [ From 8ee88235bfeaa23d4f9e4455271b6686760be2c0 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Wed, 30 Aug 2023 22:49:10 +0200 Subject: [PATCH 093/221] rio: 0.0.16 -> 0.0.18 --- pkgs/applications/terminal-emulators/rio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 3029adbd817b..0de46add8314 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -43,16 +43,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.16"; + version = "0.0.18"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-jyfobmwDCsvhpKcAD0ivxfRENaTVjjauRBMDNPgvjVY="; + hash = "sha256-/zqJQQLpwYil4BBZJDMMC8JRAEG0vGeG0dCDzLzPk/o="; }; - cargoHash = "sha256-efMw07KH8Nic76MWTyf16Gg/8PyM9gZKSNs5cuIKBJQ="; + cargoHash = "sha256-jev4fMwCygVzvrkI1nSE5tx59nGqNKQUHCNHvkr9R90="; nativeBuildInputs = [ autoPatchelfHook From 7ee83818d71bdefb4c3a270a353e9705d474b5fd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 22:51:03 +0200 Subject: [PATCH 094/221] python311Packages.add-trailing-comma: 3.0.1 -> 3.1.0 Diff: https://github.com/asottile/add-trailing-comma/compare/v3.0.1...v3.1.0 --- .../development/python-modules/add-trailing-comma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix index b0af50573ad9..785c011c6d66 100644 --- a/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "add-trailing-comma"; - version = "3.0.1"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-wCqCKomnkYgvxDWtjBwyqKb09sTPqPgWbYohgosUaHA="; + hash = "sha256-B+wjBy42RwabVz/6qEMGpB0JmwJ9hqSskwcNj4x/B/k="; }; propagatedBuildInputs = [ From 151b3a4e48efc3afb5d4676fa470897fe8e3417c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 23:07:13 +0200 Subject: [PATCH 095/221] python311Packages.datadiff: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/datadiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 446fdaf07b31..a971509ca823 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "datadiff"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I9QpQyW3sHyUgCYZYfJecTJDNHLaQtqnXG4WeA4p5VE="; + hash = "sha256-fOcN/uqMM/HYjbRrDv/ukFzDa023Ofa7BwqC3omB0ws="; }; # Tests are not part of the PyPI releases From 52cc7e923a4594be5007a54efa5783c50a5c9c8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 30 Aug 2023 23:28:13 +0200 Subject: [PATCH 096/221] python311Packages.datasets: 2.12.0 -> 2.14.4 Diff: huggingface/datasets@refs/tags/2.12.0...2.14.4 Changelog: https://github.com/huggingface/datasets/releases/tag/2.14.4 --- .../development/python-modules/datasets/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 6e02e4abe3a1..46e8275ff314 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.12.0"; + version = "2.14.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,14 +30,9 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-o/LUzRmpM4tjiCh31KoQXzU1Z/p/91uamh7G4SGnxQM="; + hash = "sha256-2XC5k546JvqUV4xeL1SRQOHDzItL1CE3bJQMjva3IkY="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "responses<0.19" "responses" - ''; - propagatedBuildInputs = [ aiohttp dill @@ -56,10 +51,10 @@ buildPythonPackage rec { importlib-metadata ]; - # Tests require pervasive internet access. + # Tests require pervasive internet access doCheck = false; - # Module import will attempt to create a cache directory. + # Module import will attempt to create a cache directory postFixup = "export HF_MODULES_CACHE=$TMPDIR"; pythonImportsCheck = [ From fbb9e796fa0eb830981067600a6a93e9e5b1c418 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 30 Aug 2023 18:00:43 -0400 Subject: [PATCH 097/221] python310Packages.torchio: 0.18.90 -> 0.19.1 --- pkgs/development/python-modules/torchio/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 58ab010eb969..66071011f2fb 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -19,15 +19,16 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.18.90"; + version = "0.19.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fepegar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h8cvNhOkjMMbQ6Nry8FKtwnK+yhRYRGjXi/xp0i5yyY="; + hash = "sha256-SNX558kSRCS9Eks00Kj2kFmo7hCUgV6saYLsnx/Kus0="; }; propagatedBuildInputs = [ @@ -57,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Medical imaging toolkit for deep learning"; - homepage = "http://www.torchio.org/"; + homepage = "https://torchio.readthedocs.io"; license = licenses.asl20; maintainers = [ maintainers.bcdarwin ]; }; From dc46b88525474fd53962e4eca1bcd9c84df693ee Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 30 Aug 2023 18:22:52 -0400 Subject: [PATCH 098/221] python310Packages.kornia: 0.6.12 -> 0.7.0 --- pkgs/development/python-modules/kornia/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/kornia/default.nix b/pkgs/development/python-modules/kornia/default.nix index c36540714acf..5d98379045ed 100644 --- a/pkgs/development/python-modules/kornia/default.nix +++ b/pkgs/development/python-modules/kornia/default.nix @@ -2,23 +2,22 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pytestCheckHook , packaging , torch }: buildPythonPackage rec { pname = "kornia"; - version = "0.6.12"; + version = "0.7.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qLJos1ivEws/jFK4j0Kp1ij9J9ZwCoHFRYXnlYxwPFY="; + hash = "sha256-XcQXKn4F3DIgn+XQcN5ZcGZLehd/IPBgLuGzIkPSxZg="; }; propagatedBuildInputs = [ From 5ab5c5d6c7c4ee56359d307f4339f5169bac0fe7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 30 Aug 2023 23:48:57 +0200 Subject: [PATCH 099/221] golly: 4.1 -> 4.2 --- pkgs/applications/science/misc/golly/default.nix | 8 +++----- pkgs/top-level/all-packages.nix | 10 +++++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 8814b33c4b14..52b05cbb7e9b 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchurl, wxGTK, perl, python3, zlib, libGLU, libGL, libX11, SDL2}: stdenv.mkDerivation rec { pname = "golly"; - version = "4.1"; + version = "4.2"; src = fetchurl { - sha256 = "1j30dpzy6wh8fv1j2750hzc6wb0nhk83knl9fapccxgxw9n5lrbc"; + hash = "sha256-VpEoqSPaZMP/AGIYZAbk5R/f8Crqvx8pKYN1O9Bl6V0="; url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz"; }; @@ -17,9 +17,6 @@ stdenv.mkDerivation rec { ''; postPatch = '' - sed -e '/gollydir =/agollydir += "/../share/golly/";' -i wxgolly.cpp - grep share/golly wxgolly.cpp - sed -e 's@PYTHON_SHLIB@${python3}/lib/libpython3.so@' -i wxprefs.cpp sed -e 's@PERL_SHLIB@'"$(find "${perl}/lib/" -name libperl.so)"'@' -i wxprefs.cpp ! grep _SHLIB *.cpp @@ -31,6 +28,7 @@ stdenv.mkDerivation rec { makeFlags=[ "-f" "makefile-gtk" "ENABLE_SOUND=1" "ENABLE_PERL=1" + "GOLLYDIR=${placeholder "out"}/share/golly" ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d26267c62e08..5d6088c1c779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40111,7 +40111,15 @@ with pkgs; gravit = callPackage ../applications/science/astronomy/gravit { }; golly = callPackage ../applications/science/misc/golly { - wxGTK = wxGTK32; + wxGTK = wxGTK32.overrideAttrs (x: { + configureFlags = x.configureFlags ++ [ + "--enable-webrequest" + ]; + buildInputs = x.buildInputs ++ [ + curl + ]; + }); + perl = perl536; }; megam = callPackage ../applications/science/misc/megam { }; From 480cb308dca82aec4b472a8d121727f0c2842b9d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 30 Aug 2023 19:01:29 -0400 Subject: [PATCH 100/221] python310Packages.formulae: 0.3.4 -> 0.5.0 --- pkgs/development/python-modules/formulae/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index 9755fed90238..769918d1b964 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook , numpy , pandas @@ -10,16 +11,20 @@ buildPythonPackage rec { pname = "formulae"; - version = "0.3.4"; + version = "0.5.0"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bambinos"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-6IGTn3griooslN6+qRYLJiWaJhvsxa1xj1+1kQ57yN0="; + rev = "refs/tags/${version}"; + hash = "sha256-WDWpyrHXGBfheE0m5I9K+Dk1urXRMY6yoenN3OaZogM="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ numpy pandas From efa1dbb5cd0d287eeba469f8280573430d20e8bd Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 31 Aug 2023 01:11:46 +0200 Subject: [PATCH 101/221] tautulli: 2.12.5 -> 2.13.1 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 10f92e38a041..3872b7783529 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.12.5"; + version = "2.13.1"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ruCTmLmAsDzrNUZAeu0NjgPZRG1ZEOFUdprMvO6ZWbc="; + sha256 = "sha256-+uVBvtwMJRqPWJKQ0Tn9wLiuR02Btsbxd9+rl9tAlgg="; }; installPhase = '' From b58682df38bb9c53aec11cea7d499f924d1dfb41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Aug 2023 23:24:04 +0000 Subject: [PATCH 102/221] tdb: 1.4.8 -> 1.4.9 --- pkgs/development/libraries/tdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index c166d36d5a60..13f55a2dc52b 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "tdb"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; + hash = "sha256-CsImBz46LbhkjaevdEy5X1B2alL+6wAdVYsrMht0p2U="; }; nativeBuildInputs = [ From d970db15e3107933579cca94ec740238c5fce949 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 30 Aug 2023 19:44:49 -0400 Subject: [PATCH 103/221] vimPlugins.sg-nvim: fix cargoHash --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e5be182529f7..f14853648c87 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -966,7 +966,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-qwllMt4va9j8Sfh2+xYcfRtQgypNKZLDT3gRD7dUQ+w="; + cargoHash = "sha256-BXmf/eUxfsqq49K31k1+KjMHTV7KBTh0Sse/hCcFjqw="; nativeBuildInputs = [ pkg-config ]; From 9f1e0838eebdc05b6843c63f6253ad517a369fa7 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 31 Aug 2023 09:51:15 +1000 Subject: [PATCH 104/221] metals: 1.0.0 -> 1.0.1 --- pkgs/development/tools/language-servers/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 10ff9bfd4b86..df78ed497d2f 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.0.0"; + version = "1.0.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-futBxdMEJN0UdDvlk5FLUUmcG7r7P7D81IhbC2oYn5s="; + outputHash = "sha256-AamUE6mr9fwjbDndQtzO2Yscu2T6zUW/DiXMYwv35YE="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; From bbb8c464705ad13e199159ccfe11cea6b70eff75 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 30 Aug 2023 15:52:16 -0700 Subject: [PATCH 105/221] sqlc: update source repository The repository changed to sqlc-dev on github. --- pkgs/development/tools/database/sqlc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index dfe0cac81f89..92a740ac0a7a 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -8,7 +8,7 @@ buildGoModule { inherit version; src = fetchFromGitHub { - owner = "kyleconroy"; + owner = "sqlc-dev"; repo = "sqlc"; rev = "v${version}"; sha256 = "sha256-ITW5jIlNoiW7sl6s5jCVRELglauZzSPmAj3PXVpdIGA="; From ebd9c4018fa86ebf7b8d1a4f36427b6687ba774d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 00:36:29 +0000 Subject: [PATCH 106/221] ocserv: 1.2.0 -> 1.2.1 --- pkgs/tools/networking/ocserv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index ec1d3acea005..eb1795e73546 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ocserv"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { owner = "openconnect"; repo = "ocserv"; rev = version; - sha256 = "sha256-EwjP4HKJEPMnn2tnJG7tPgHc49iQQm+V1mKx8CLOSkw="; + sha256 = "sha256-mYf0cdWIxRSDGvszlFDex2SU6TtvodD1sXcUZOOcYd0="; }; nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ]; From ea5378fdb96ab99f6958580ccf52eb76d62544d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 00:52:36 +0000 Subject: [PATCH 107/221] closurecompiler: 20230502 -> 20230802 --- pkgs/development/compilers/closure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index bb8294ff6c73..02fff2b3d9b3 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20230502"; + version = "20230802"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-h/kKVX49KuivQwrG9KQr7PG0U0heiQmZd3pSyQvanSI="; + sha256 = "sha256-IwqeBain2dqgg7H26G7bpusexkAqaiWEMv5CRc3EqV8="; }; dontUnpack = true; From 78734454e4777d193c80ed40a17da2b4af18b073 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 30 Aug 2023 14:25:57 -0400 Subject: [PATCH 108/221] hyprnome: init at 0.1.0 --- pkgs/applications/misc/hyprnome/default.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/misc/hyprnome/default.nix diff --git a/pkgs/applications/misc/hyprnome/default.nix b/pkgs/applications/misc/hyprnome/default.nix new file mode 100644 index 000000000000..906bc00dce52 --- /dev/null +++ b/pkgs/applications/misc/hyprnome/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprnome"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "donovanglover"; + repo = "hyprnome"; + rev = version; + hash = "sha256-jb21hnPSzrCTuW7Yhs6jFzS2WUVQjkn6nCCi6LvoTGA="; + }; + + cargoHash = "sha256-QM5v2hKP3E9W3Aek6kFyFFNAp9s0oTFb4CEtxEHyny0="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installManPage man/hyprnome.1 + + installShellCompletion --cmd hyprnome \ + --bash <(cat completions/hyprnome.bash) \ + --fish <(cat completions/hyprnome.fish) \ + --zsh <(cat completions/_hyprnome) + ''; + + meta = with lib; { + description = "GNOME-like workspace switching in Hyprland"; + homepage = "https://github.com/donovanglover/hyprnome"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ donovanglover ]; + mainProgram = "hyprnome"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33d98a712ac5..123ce98889fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5660,6 +5660,8 @@ with pkgs; hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { }; + hyprnome = callPackage ../applications/misc/hyprnome { }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { From c736c29f0b3eab0c20d2fcb0a69479808ff99535 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 01:45:13 +0000 Subject: [PATCH 109/221] python311Packages.clarifai: 9.5.2 -> 9.7.1 --- pkgs/development/python-modules/clarifai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index ffc02aa60480..8f6fdc18509f 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "9.5.2"; + version = "9.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-utils"; rev = "refs/tags/${version}"; - hash = "sha256-29by0YAQ7qc0gL/3lAFOk4FLDB5Qv4X9QDyK49gfyAo="; + hash = "sha256-/zgHgD2kf3ZG7Mu9AEBfOwqpcD0Ye0LVrFxLeuGurCM="; }; propagatedBuildInputs = [ From 70a503b3af0bce53eb9882c35de6b9ceb626a0a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 01:58:51 +0000 Subject: [PATCH 110/221] air: 1.44.0 -> 1.45.0 --- pkgs/development/tools/air/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 9d374fc02288..b42fe4c16c59 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.44.0"; + version = "1.45.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-BLha2PDn7iF0B5OPVkJT6en1Znt/6xiHxuCj14ha9tc="; + hash = "sha256-q1BnY0ztnhtsks1+GC1awR9o6nodXyb8rf1waVAs3gM="; }; - vendorHash = "sha256-n2Ei+jckSYAydAdJnMaPc7FGUcwSbC49hk6nlDyDMPE="; + vendorHash = "sha256-vyuXmQEjy5kPk9cKosHx0JZSZxstYtCNyfLIlRt2bnk="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; From cfbc8f99bc1d80d04af38064abbdead3a3e7e075 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 31 Aug 2023 10:01:42 +0800 Subject: [PATCH 111/221] blocky: 0.21 -> 0.22 --- pkgs/applications/networking/blocky/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index b18fa340b8dc..bd07776c7df0 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.21"; + version = "0.22"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+88QMASMEY1pJuejFUqqW1Ky7TpoSwCzUy1oueL7FKU="; + hash = "sha256-iU7fpTn8sPtglZfqLJ6fVYbHtYp0jqItSpJsvN4iKE8="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-EsANifwaEi5PdY0Y2QZjD55sZqsqYWrC5Vh4uxpTs5A="; + vendorHash = "sha256-PnqpDAbHCs1wFudYy+nyG+p/E6ig7ZuhbuU4CFFoiyk="; ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ]; From bd502cad2c9bb41481c641fcb4c935c2bdcb9483 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 31 Aug 2023 10:06:13 +0800 Subject: [PATCH 112/221] docker-compose: 2.20.3 -> 2.21.0 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 950c611ca2ce..db6d5a3dadb9 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.20.3"; + version = "2.21.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-dCcCtQTow8S0dyAD8UT6p64erSAl7oiZdbpYsO4/Z/s="; + hash = "sha256-JekWw5YI6O+CLXc7oNIxPJsRzYimGFDGL6ACyM4D04k="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-pNCAEuaF4FkSCmW1JcDMxOtVM6mL7dYLtVu4oUBqoS8="; + vendorHash = "sha256-vVnaZLvPbhJNFn/ACuYDbXCKPKNlYoGCm+liTlPMcjs="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 75ed43fa8478a47eecf8e66a672970f799ba4852 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 31 Aug 2023 10:13:04 +0800 Subject: [PATCH 113/221] copilot-cli: 1.29.1 -> 1.30.0 --- pkgs/tools/admin/copilot-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index a9cd2230ed8d..b7176656363a 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.29.1"; + version = "1.30.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Mfh3Bym9aVvCaRHcSyg68KqA1Zx0tt7x52IOzvC+61M="; + hash = "sha256-Q495MJlvElm5yrX4QWrwvB62Tdzq0W5pTYsTXyw9Idw="; }; - vendorHash = "sha256-0QPUvKGuR4fhXUoak6PqkBXsg+WkAOlSluci6/+ULB8="; + vendorHash = "sha256-/2uUiFL2wL+gAzqY2S3sqytPLKB5+QkYXCBNLqSJSWU="; nativeBuildInputs = [ installShellFiles ]; From 851f7940525f6b3fddabea403754dd5f16988ba1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 31 Aug 2023 10:17:16 +0800 Subject: [PATCH 114/221] earthly: 0.7.15 -> 0.7.17 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 06983c3e286c..225a2981a604 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.15"; + version = "0.7.17"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-cCN63eHfYAsCcvRU+hAH+dZJHlmBu7MitvrjGB/qzMU="; + hash = "sha256-JkZVuOlN9lDTdJ2076+STLU+UcoAAmWdqsBDGMtUJyw="; }; - vendorHash = "sha256-8t7nWVItX9OPo6fsJuzo+w6ZyVcsqwi2e7HE2nqyYck="; + vendorHash = "sha256-R3UxfshCAca73xRnjen5Dg8/gbTrTpZsz9HB18/MxEQ="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; From d61a3d53debcbd4873f6798dc80b73723b303bf1 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 31 Aug 2023 12:27:29 +1000 Subject: [PATCH 115/221] turso-cli: 0.80.0 -> 0.81.0 --- pkgs/development/tools/turso-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 7413f3ee4f4d..2b9d622dedd0 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.80.0"; + version = "0.81.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-Q0H9Wq0QMh6rrEpfVdrU+e1wpcu1qE6t5d2PUBGsxRQ="; + hash = "sha256-Ck1q3II/o7f+n0pdR5PzUXG2c6GZmQFeddofHzPTLlA="; }; - vendorHash = "sha256-VbekKkS7cHe29O/YKIlxZ+BU9XSRlsBL06AKi2WelCs="; + vendorHash = "sha256-Y/pg8+w6B1YQqaZ5wj8QZxiBHAG0Tf3Zec5WlVyA4eI="; # Test_setDatabasesCache fails due to /homeless-shelter: read-only file system error. doCheck = false; From 0ced6748c91ff1913315fb7f7c46ec963d4a8bee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 02:32:25 +0000 Subject: [PATCH 116/221] jmol: 16.1.33 -> 16.1.35 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index e4ffb94eeba7..1b77cef6b809 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.1.33"; + version = "16.1.35"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-vOFGmLsCQNYRBMuDRVrdjWE6/MxY7IucB1OpV4cdZrs="; + hash = "sha256-r1ydAwAdXl5RRj64W0j8L7XbgnC7VOYjFNE019BcbpY="; }; patchPhase = '' From 0042d1a5995776402522377de809613aa1b3fe04 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 30 Aug 2023 20:53:16 -0600 Subject: [PATCH 117/221] python3Packages.blockfrost-python: init at 0.5.3 --- .../blockfrost-python/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/blockfrost-python/default.nix diff --git a/pkgs/development/python-modules/blockfrost-python/default.nix b/pkgs/development/python-modules/blockfrost-python/default.nix new file mode 100644 index 000000000000..043384e80bf0 --- /dev/null +++ b/pkgs/development/python-modules/blockfrost-python/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "blockfrost-python"; + version = "0.5.3"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "blockfrost"; + repo = "blockfrost-python"; + rev = "${version}"; + hash = "sha256-mQ8avjyLARJONYn18neCyuHEuv3ySyCNMe+P4+Dlxck="; + }; + + propagatedBuildInputs = [ + requests + setuptools + ]; + + pythonImportsCheck = [ "blockfrost" ]; + + meta = with lib; { + description = "Python SDK for the Blockfrost.io API"; + homepage = "https://github.com/blockfrost/blockfrost-python"; + license = licenses.asl20; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07579855b664..2403280c6814 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1436,6 +1436,8 @@ self: super: with self; { block-io = callPackage ../development/python-modules/block-io { }; + blockfrost-python = callPackage ../development/python-modules/blockfrost-python { }; + blocksat-cli = callPackage ../development/python-modules/blocksat-cli { }; blosc2 = callPackage ../development/python-modules/blosc2 { }; From 35e66ea4f690fd54b78d01e2ded2d32e7c04e5c8 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 30 Aug 2023 20:54:05 -0600 Subject: [PATCH 118/221] python3Packages.cose: init at 1.0.1 --- .../python-modules/cose/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/cose/default.nix diff --git a/pkgs/development/python-modules/cose/default.nix b/pkgs/development/python-modules/cose/default.nix new file mode 100644 index 000000000000..c591677b5316 --- /dev/null +++ b/pkgs/development/python-modules/cose/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, attrs +, cbor2 +, certvalidator +, cryptography +, ecdsa +, setuptools +}: + +buildPythonPackage rec { + pname = "cose"; + version = "1.0.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "TimothyClaeys"; + repo = "pycose"; + rev = "v${version}"; + hash = "sha256-8d6HebWlSKgx7dmOnT7ZZ5mrMfg6mNWhz1hHPv75XF4="; + }; + + propagatedBuildInputs = [ + attrs + cbor2 + certvalidator + cryptography + ecdsa + setuptools + ]; + + pythonImportsCheck = [ "pycose" ]; + + meta = with lib; { + description = "A Python implementation of the COSE specification"; + homepage = "https://github.com/TimothyClaeys/pycose"; + license = licenses.bsd3; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2403280c6814..0dffd99b7761 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2201,6 +2201,8 @@ self: super: with self; { corsair-scan = callPackage ../development/python-modules/corsair-scan { }; + cose = callPackage ../development/python-modules/cose { }; + cot = callPackage ../development/python-modules/cot { }; covCore = callPackage ../development/python-modules/cov-core { }; From 4810bb105ebb2295dac27f0c3f1fd9d1a2833176 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Wed, 30 Aug 2023 20:56:43 -0600 Subject: [PATCH 119/221] python3Packages.pycardano: init at 0.9.0 --- .../python-modules/pycardano/default.nix | 67 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/pycardano/default.nix diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix new file mode 100644 index 000000000000..8345a3da2065 --- /dev/null +++ b/pkgs/development/python-modules/pycardano/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +# Python deps +, blockfrost-python +, cbor2 +, cose +, ecpy +, frozendict +, frozenlist +, mnemonic +, poetry-core +, pprintpp +, pynacl +, setuptools +, typeguard +, websocket-client +}: + +let + cose_0_9_dev8 = cose.overridePythonAttrs (old: rec { + version = "0.9.dev8"; + src = (old.src.override { + rev = "v${version}"; + hash = "sha256-/jwq2C2nvHInsgPG4jZCr+XsvlUJdYewAkasrUPVaHM="; + }); + pythonImportsCheck = [ "cose" ]; + }); + +in buildPythonPackage rec { + pname = "pycardano"; + version = "0.9.0"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Python-Cardano"; + repo = "pycardano"; + rev = "v${version}"; + hash = "sha256-KRlpGhEzABBh1YWCDcrpW4hyMOhEA1Rla9nh95qdVik="; + }; + + propagatedBuildInputs = [ + blockfrost-python + cbor2 + cose_0_9_dev8 + ecpy + frozendict + frozenlist + mnemonic + poetry-core + pprintpp + pynacl + setuptools + typeguard + websocket-client + ]; + + pythonImportsCheck = [ "pycardano" ]; + + meta = with lib; { + description = "A lightweight Cardano library in Python"; + homepage = "https://github.com/Python-Cardano/pycardano"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0dffd99b7761..38fa2eede5c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8818,6 +8818,8 @@ self: super: with self; { py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + pycardano = callPackage ../development/python-modules/pycardano { }; + pycrc = callPackage ../development/python-modules/pycrc { }; pycritty = callPackage ../development/python-modules/pycritty { }; From b18eba2da85fc134270eb62ba48d371cd8522340 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 31 Aug 2023 12:26:38 +0900 Subject: [PATCH 120/221] python310Packages.optimum: 1.11.1 -> 1.12.0 Diff: https://github.com/huggingface/optimum/compare/refs/tags/v1.11.1...v1.12.0 Changelog: https://github.com/huggingface/optimum/releases/tag/refs/tags/v1.12.0 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 6f781c3f174d..0c8a9a738aa1 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-J0QcHmR2hVd/Ygi7QFtsObwx/Sm3DCwU+DojzXHokYU="; + hash = "sha256-/Z7Gh8pAa5z96X7rdcuq6kxtpF53EFGIYOu1ft8w+XM="; }; propagatedBuildInputs = [ From d5e5246e76a54522a3bf2ff472b2205773f922b2 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Thu, 29 Jun 2023 08:24:57 +0000 Subject: [PATCH 121/221] cudaPackages: split outputs This change which involves creating multiple outputs for CUDA redistributable packages. We use a script to find out, ahead of time, the outputs each redist package provides. From that, we are able to create multiple outputs for supported redist packages, allowing users to specify exactly which components they require. Beyond the script which finds outputs ahead of time, there is some custom code involved in making this happen. For example, the way Nixpkgs typically handles multiple outputs involves making `dev` the default output when available, and adding `out` to `dev`'s `propagatedBuildInputs`. Instead, we make each output independent of the others. If a user wants only to include the headers found in a redist package, they can do so by choosing the `dev` output. If they want to include dynamic libraries, they can do so by specifying the `lib` output, or `static` for static libraries. To avoid breakages, we continue to provide the `out` output, which becomes the union of all other outputs, effectively making the split outputs opt-in. --- doc/languages-frameworks/cuda.section.md | 62 + .../cudatoolkit/hooks/nvcc-setup-hook.sh | 2 +- .../cudatoolkit/hooks/setup-cuda-hook.sh | 2 +- .../redist/build-cuda-redist-package.nix | 146 +- .../cudatoolkit/redist/extension.nix | 156 +- .../manifests/redistrib_features_11.4.4.json | 1518 ++++++++++++ .../manifests/redistrib_features_11.5.2.json | 1536 ++++++++++++ .../manifests/redistrib_features_11.6.2.json | 1546 +++++++++++++ .../manifests/redistrib_features_11.7.0.json | 1565 +++++++++++++ .../manifests/redistrib_features_11.8.0.json | 1938 ++++++++++++++++ .../manifests/redistrib_features_12.0.1.json | 2050 +++++++++++++++++ .../manifests/redistrib_features_12.1.1.json | 2050 +++++++++++++++++ .../manifests/redistrib_features_12.2.0.json | 2030 ++++++++++++++++ .../cudatoolkit/redist/overrides.nix | 104 +- .../libraries/science/math/cudnn/generic.nix | 76 +- .../libraries/science/math/magma/generic.nix | 14 +- .../python-modules/torch/default.nix | 5 +- 17 files changed, 14691 insertions(+), 109 deletions(-) create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json create mode 100644 pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md index 2d680ea6b3b6..01a4f20da982 100644 --- a/doc/languages-frameworks/cuda.section.md +++ b/doc/languages-frameworks/cuda.section.md @@ -54,3 +54,65 @@ for your specific card(s). Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) and release notes for their software package. + +## Adding a new CUDA release {#adding-a-new-cuda-release} + +> **WARNING** +> +> This section of the docs is still very much in progress. Feedback is welcome in GitHub Issues tagging @NixOS/cuda-maintainers or on [Matrix](https://matrix.to/#/#cuda:nixos.org). + +The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. + +All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update. + +### Updating CUDA redistributables {#updating-cuda-redistributables} + +1. Go to NVIDIA's index of CUDA redistributables: +2. Copy the `redistrib_*.json` corresponding to the release to `pkgs/development/compilers/cudatoolkit/redist/manifests`. +3. Generate the `redistrib_features_*.json` file by running: + + ```bash + nix run github:ConnorBaker/cuda-redist-find-features -- + ``` + + That command will generate the `redistrib_features_*.json` file in the same directory as the manifest. + +4. Include the path to the new manifest in `pkgs/development/compilers/cudatoolkit/redist/extension.nix`. + +### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit} + +> **WARNING** +> +> While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended and should it be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. +> +> To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available. + +1. Go to NVIDIA's CUDA Toolkit runfile installer download page: +2. Select the appropriate OS, architecture, distribution, and version, and installer type. + + - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local) + - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work. + +3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running: + + ```bash + nix store prefetch-file --hash-type sha256 + ``` + +4. Update `pkgs/development/compilers/cudatoolkit/versions.toml` to include the release. + +### Updating the CUDA package set {#updating-the-cuda-package-set} + +1. Include a new `cudaPackages__` package set in `pkgs/top-level/all-packages.nix`. + + - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing. + +2. Successfully build the closure of the new package set, updating `pkgs/development/compilers/cudatoolkit/redist/overrides.nix` as needed. Below are some common failures: + +| Unable to ... | During ... | Reason | Solution | Note | +| --- | --- | --- | --- | --- | +| Find headers | `configurePhase` or `buildPhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain the headers | +| Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain CMake configuration files | +| Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries | + +In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`cudaPackages.autoAddOpenGLRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.autoAddOpenGLRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. diff --git a/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh index 89801eb7c21a..e75a84a9550e 100644 --- a/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh +++ b/pkgs/development/compilers/cudatoolkit/hooks/nvcc-setup-hook.sh @@ -2,4 +2,4 @@ # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for # CUDAToolkit_ROOT. We have to help it locate libcudart -export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" +export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" diff --git a/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh b/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh index 89256e86f789..5ea57594211c 100644 --- a/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh +++ b/pkgs/development/compilers/cudatoolkit/hooks/setup-cuda-hook.sh @@ -56,7 +56,7 @@ setupCUDAToolkitCompilers() { # CMake's enable_language(CUDA) runs a compiler test and it doesn't account for # CUDAToolkit_ROOT. We have to help it locate libcudart if [[ -z "${nvccDontPrependCudartFlags-}" ]] ; then - export NVCC_APPEND_FLAGS+=" -L@cudartRoot@/lib -I@cudartRoot@/include" + export NVCC_APPEND_FLAGS+=" -L@cudartLib@/lib -L@cudartStatic@/lib -I@cudartInclude@/include" fi } 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 ec2c9cf72a9e..038841a7097d 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -1,3 +1,10 @@ +# Type Aliases +# +# See ./extension.nix: +# - ReleaseAttrs +# - ReleaseFeaturesAttrs +# +# General callPackage-supplied arguments { lib , stdenv , backendStdenv @@ -5,23 +12,58 @@ , autoPatchelfHook , autoAddOpenGLRunpathHook , markForCudatoolkitRootHook +, lndir +, symlinkJoin +}: +# Function arguments +{ + # Short package name (e.g., "cuda_cccl") + # pname : String + pname +, # Long package name (e.g., "CXX Core Compute Libraries") + # description : String + description +, # platforms : List System + platforms +, # version : Version + version +, # releaseAttrs : ReleaseAttrs + releaseAttrs +, # releaseFeaturesAttrs : ReleaseFeaturesAttrs + releaseFeaturesAttrs +, }: - -pname: -attrs: - let - arch = "linux-x86_64"; + # Useful imports + inherit (lib.lists) optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) optionalString; in backendStdenv.mkDerivation { - inherit pname; - inherit (attrs) version; + # NOTE: Even though there's no actual buildPhase going on here, the derivations of the + # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package + # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are + # also sensitive to the compiler flags provided to stdenv. + inherit pname version; + strictDeps = true; - src = assert (lib.hasAttr arch attrs); fetchurl { - url = "https://developer.download.nvidia.com/compute/cuda/redist/${attrs.${arch}.relative_path}"; - inherit (attrs.${arch}) sha256; + outputs = with releaseFeaturesAttrs; + [ "out" ] + ++ optionals hasBin [ "bin" ] + ++ optionals hasLib [ "lib" ] + ++ optionals hasStatic [ "static" ] + ++ optionals hasDev [ "dev" ] + ++ optionals hasDoc [ "doc" ] + ++ optionals hasSample [ "sample" ]; + + src = fetchurl { + url = "https://developer.download.nvidia.com/compute/cuda/redist/${releaseAttrs.relative_path}"; + inherit (releaseAttrs) sha256; }; + # We do need some other phases, like configurePhase, so the multiple-output setup hook works. + dontBuild = true; + nativeBuildInputs = [ autoPatchelfHook # This hook will make sure libcuda can be found @@ -46,23 +88,87 @@ backendStdenv.mkDerivation { "$ORIGIN" ]; - dontBuild = true; + installPhase = with releaseFeaturesAttrs; + # Pre-install hook + '' + runHook preInstall + '' + # doc and dev have special output handling. Other outputs need to be moved to their own + # output. + # Note that moveToOutput operates on all outputs: + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 + + '' + mkdir -p "$out" + rm LICENSE + mv * "$out" + '' + # Handle bin, which defaults to out + + optionalString hasBin '' + moveToOutput "bin" "$bin" + '' + # Handle lib, which defaults to out + + optionalString hasLib '' + moveToOutput "lib" "$lib" + '' + # Handle static libs, which isn't handled by the setup hook + + optionalString hasStatic '' + moveToOutput "**/*.a" "$static" + '' + # Handle samples, which isn't handled by the setup hook + + optionalString hasSample '' + moveToOutput "samples" "$sample" + '' + # Post-install hook + + '' + runHook postInstall + ''; - # TODO: choose whether to install static/dynamic libs - installPhase = '' - runHook preInstall - rm LICENSE - mkdir -p $out - mv * $out - runHook postInstall + # The out output leverages the same functionality which backs the `symlinkJoin` function in + # Nixpkgs: + # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 + # + # That should allow us to emulate "fat" default outputs without having to actually create them. + # + # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. + postPhases = [ "postPatchelf" ]; + # For each output, create a symlink to it in the out output. + # NOTE: We must recreate the out output here, because the setup hook will have deleted it + # if it was empty. + # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases + # which are empty strings are skipped/unset and result in errors of the form "command not + # found: ". + postPatchelf = '' + mkdir -p "$out" + for output in $outputs; do + if [ "$output" = "out" ]; then + continue + fi + ${getExe lndir} "''${!output}" "$out" + done ''; + # Make the CUDA-patched stdenv available passthru.stdenv = backendStdenv; + # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs + # from depending on `out` by default. + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 + # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. + propagatedBuildOutputs = false; + + # By default, if the dev output exists it just uses that. + # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or + # anything of the sort. To remedy this, we set outputSpecified to true, and use + # outputsToInstall, which tells Nix which outputs to use when the package name is used + # unqualified (that is, without an explicit output). + outputSpecified = true; + meta = { - description = attrs.name; + inherit description platforms; license = lib.licenses.unfree; maintainers = lib.teams.cuda.members; - platforms = lib.optionals (lib.hasAttr arch attrs) [ "x86_64-linux" ]; + # Force the use of the default, fat output by default (even though `dev` exists, which + # causes Nix to prefer that output over the others if outputSpecified isn't set). + outputsToInstall = [ "out" ]; }; } diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix index 730ee1d28f56..58f2b205dd59 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/extension.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/extension.nix @@ -1,33 +1,139 @@ -final: prev: let - +# Type Aliases +# +# ReleaseAttrs : { +# "relative_path" : String, +# "sha256" : String, +# "md5" : String, +# "size" : String, +# } +# +# NOTE: PackageAttrs must have at least one of the arches. +# PackageAttrs : { +# "name" : String, +# "license" : String, +# "version" : String, +# "license_path" : None | String, +# "linux-aarch64" : None | ReleaseAttrs, +# "linux-ppc64le" : None | ReleaseAttrs, +# "linux-sbsa" : None | ReleaseAttrs, +# "linux-x86_64" : None | ReleaseAttrs, +# "windows-x86_64" : None | ReleaseAttrs, +# } +# +# ReleaseFeaturesAttrs : { +# "hasBin" : Boolean, +# "hasDev" : Boolean, +# "hasDoc" : Boolean, +# "hasLib" : Boolean, +# "hasOut" : Boolean, +# "hasSample" : Boolean, +# "hasStatic" : Boolean, +# "rootDirs" : List String, +# } +# +# NOTE: PackageFeatureAttrs must have at least one of the arches. +# PackageFeatureAttrs : { +# "linux-aarch64" : None | ReleaseFeaturesAttrs, +# "linux-ppc64le" : None | ReleaseFeaturesAttrs, +# "linux-sbsa" : None | ReleaseFeaturesAttrs, +# "linux-x86_64" : None | ReleaseFeaturesAttrs, +# "windows-x86_64" : None | ReleaseFeaturesAttrs, +# } +# +final: prev: +let + # NOTE: We use hasAttr throughout instead of the (?) operator because hasAttr does not require + # us to interpolate our variables into strings (like ${attrName}). + inherit (builtins) attrNames concatMap hasAttr listToAttrs removeAttrs; inherit (final) callPackage; - inherit (prev) cudaVersion lib; + inherit (prev) cudaVersion; + inherit (prev.lib.attrsets) nameValuePair optionalAttrs; + inherit (prev.lib.lists) optionals; + inherit (prev.lib.trivial) flip importJSON pipe; - ### Cuda Toolkit Redist - - # Manifest files for redist cudatoolkit. These can be found at + # Manifest files for CUDA redistributables (aka redist). These can be found at # https://developer.download.nvidia.com/compute/cuda/redist/ - cudaToolkitRedistManifests = { - "11.4" = ./manifests/redistrib_11.4.4.json; - "11.5" = ./manifests/redistrib_11.5.2.json; - "11.6" = ./manifests/redistrib_11.6.2.json; - "11.7" = ./manifests/redistrib_11.7.0.json; - "11.8" = ./manifests/redistrib_11.8.0.json; - "12.0" = ./manifests/redistrib_12.0.1.json; - "12.1" = ./manifests/redistrib_12.1.1.json; - "12.2" = ./manifests/redistrib_12.2.0.json; + # Maps a cuda version to the specific version of the manifest. + cudaVersionMap = { + "11.4" = "11.4.4"; + "11.5" = "11.5.2"; + "11.6" = "11.6.2"; + "11.7" = "11.7.0"; + "11.8" = "11.8.0"; + "12.0" = "12.0.1"; + "12.1" = "12.1.1"; + "12.2" = "12.2.0"; }; - # Function to build a single cudatoolkit redist package - buildCudaToolkitRedistPackage = callPackage ./build-cuda-redist-package.nix { }; + # Check if the current CUDA version is supported. + cudaVersionMappingExists = hasAttr cudaVersion cudaVersionMap; - # Function that builds all cudatoolkit redist packages given a cuda version and manifest file - buildCudaToolkitRedistPackages = { version, manifest }: let - attrs = lib.filterAttrs (key: value: key != "release_date") (lib.importJSON manifest); - in lib.mapAttrs buildCudaToolkitRedistPackage attrs; + # Maps a cuda version to its manifest files. + # The manifest itself is from NVIDIA, but the features manifest is generated + # by us ahead of time and allows us to split pacakges into multiple outputs. + # Package names (e.g., "cuda_cccl") are mapped to their attributes or features. + # Since we map each attribute to a package name, we need to make sure to get rid of meta + # attributes included in the manifest. Currently, these are any of the following: + # - release_date + # - release_label + # - release_product + redistManifests = + let + # Remove meta attributes from the manifest + # removeAttrs : AttrSet String b -> Attr String b + removeMetaAttrs = flip removeAttrs [ "release_date" "release_label" "release_product" ]; + # processManifest : Path -> Attr Set (String PackageAttrs) + processManifest = flip pipe [ importJSON removeMetaAttrs ]; + # fullCudaVersion : String + fullCudaVersion = cudaVersionMap.${cudaVersion}; + in + { + # features : Attr Set (String PackageFeatureAttrs) + features = processManifest ./manifests/redistrib_features_${fullCudaVersion}.json; + # manifest : Attr Set (String PackageAttrs) + manifest = processManifest ./manifests/redistrib_${fullCudaVersion}.json; + }; - # All cudatoolkit redist packages for the current cuda version - cudaToolkitRedistPackages = lib.optionalAttrs (lib.hasAttr cudaVersion cudaToolkitRedistManifests) - (buildCudaToolkitRedistPackages { version = cudaVersion; manifest = cudaToolkitRedistManifests.${cudaVersion}; }); + # Function to build a single redist package + buildRedistPackage = callPackage ./build-cuda-redist-package.nix { }; -in cudaToolkitRedistPackages + # Function that builds all redist packages given manifests + buildRedistPackages = { features, manifest }: + let + wrapper = pname: + let + # Get the redist architectures the package provides distributables for + packageAttrs = manifest.${pname}; + + # Check if supported + # TODO(@connorbaker): Currently hardcoding x86_64-linux as the only supported platform. + isSupported = packageAttrs ? linux-x86_64; + + # Build the derivation + drv = buildRedistPackage { + inherit pname; + # TODO(@connorbaker): We currently discard the license attribute. + inherit (manifest.${pname}) version; + description = manifest.${pname}.name; + platforms = [ "x86_64-linux" ]; + releaseAttrs = manifest.${pname}.linux-x86_64; + releaseFeaturesAttrs = features.${pname}.linux-x86_64; + }; + + # Wrap in an optional so we can filter out the empty lists created by unsupported + # packages with concatMap. + wrapped = optionals isSupported [ (nameValuePair pname drv) ]; + in + wrapped; + + # concatMap provides us an easy way to filter out packages for unsupported platforms. + # We wrap the buildRedistPackage call in a list to prevent errors when the package is not + # supported (by returning an empty list). + redistPackages = listToAttrs (concatMap wrapper (attrNames manifest)); + in + redistPackages; + + # All redistributable packages for the current CUDA version + redistPackages = optionalAttrs cudaVersionMappingExists (buildRedistPackages redistManifests); +in +redistPackages diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json new file mode 100644 index 000000000000..04a33a88a863 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json @@ -0,0 +1,1518 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json new file mode 100644 index 000000000000..f07f1826dec8 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json @@ -0,0 +1,1536 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json new file mode 100644 index 000000000000..c4f02188c4d4 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json @@ -0,0 +1,1546 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "lib32" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json new file mode 100644 index 000000000000..56ef5a91b038 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json @@ -0,0 +1,1565 @@ +{ + "cuda_cccl": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_cudart": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include" + ] + } + }, + "cuda_nvprune": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_sanitizer_api": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcufft": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt", + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json new file mode 100644 index 000000000000..4a71b484e287 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json @@ -0,0 +1,1938 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_memcheck": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_nvtx": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "NvToolsExt" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json new file mode 100644 index 000000000000..f02ba5bfca84 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json @@ -0,0 +1,2050 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json new file mode 100644 index 000000000000..f02ba5bfca84 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json @@ -0,0 +1,2050 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvvm_samples": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nvvm" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json new file mode 100644 index 000000000000..e5201f7f81eb --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json @@ -0,0 +1,2030 @@ +{ + "cuda_cccl": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_compat": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compat" + ] + } + }, + "cuda_cudart": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_cuobjdump": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_cupti": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "samples" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": false, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "doc", + "include", + "lib", + "samples" + ] + } + }, + "cuda_cuxxfilt": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_demo_suite": { + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "demo_suite" + ] + } + }, + "cuda_documentation": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "tools" + ] + } + }, + "cuda_gdb": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "extras", + "share" + ] + } + }, + "cuda_nsight": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsightee_plugins" + ] + } + }, + "cuda_nvcc": { + "linux-aarch64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "nvvm" + ] + } + }, + "cuda_nvdisasm": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvml_dev": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "nvml", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "nvml" + ] + } + }, + "cuda_nvprof": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvprune": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin" + ] + } + }, + "cuda_nvrtc": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "cuda_nvtx": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_nvvp": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "libnvvp" + ] + } + }, + "cuda_opencl": { + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib" + ] + } + }, + "cuda_profiler_api": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include" + ] + } + }, + "cuda_sanitizer_api": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "compute-sanitizer" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "compute-sanitizer" + ] + } + }, + "fabricmanager": { + "linux-sbsa": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "etc", + "include", + "lib", + "sbin", + "share", + "systemd" + ] + } + }, + "libcublas": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libcudla": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + } + }, + "libcufft": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcufile": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": true, + "hasStatic": true, + "rootDirs": [ + "etc", + "include", + "lib", + "man", + "pkg-config", + "samples", + "tools" + ] + } + }, + "libcurand": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusolver": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libcusparse": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "src" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "src" + ] + } + }, + "libnpp": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "libnvidia_nscq": { + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "lib" + ] + } + }, + "libnvjitlink": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config", + "res" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib", + "res" + ] + } + }, + "libnvjpeg": { + "linux-aarch64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-ppc64le": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": true, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "include", + "lib", + "pkg-config" + ] + }, + "windows-x86_64": { + "hasBin": true, + "hasDev": true, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": true, + "rootDirs": [ + "bin", + "include", + "lib" + ] + } + }, + "nsight_compute": { + "linux-aarch64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-compute" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-compute" + ] + } + }, + "nsight_systems": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "nsight-systems" + ] + }, + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight-systems" + ] + } + }, + "nsight_vse": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "nsight_vse" + ] + } + }, + "nvidia_driver": { + "linux-ppc64le": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "kernel", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-sbsa": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests" + ] + }, + "linux-x86_64": { + "hasBin": true, + "hasDev": false, + "hasDoc": false, + "hasLib": true, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "bin", + "docs", + "etc", + "firmware", + "kernel", + "kernel-open", + "lib", + "lib32", + "man", + "sbin", + "share", + "src", + "supported-gpus", + "systemd", + "tests", + "wine" + ] + } + }, + "nvidia_fs": { + "linux-aarch64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-sbsa": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + }, + "linux-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "src" + ] + } + }, + "visual_studio_integration": { + "windows-x86_64": { + "hasBin": false, + "hasDev": false, + "hasDoc": false, + "hasLib": false, + "hasSample": false, + "hasStatic": false, + "rootDirs": [ + "visual_studio_integration" + ] + } + } +} diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index b962b6caa1b2..a0ac0b0fcb1f 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -1,6 +1,8 @@ final: prev: let inherit (prev) lib pkgs; + cudaVersionOlder = lib.versionOlder final.cudaVersion; + cudaVersionAtLeast = lib.versionAtLeast final.cudaVersion; in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { ### Overrides to fix the components of cudatoolkit-redist @@ -10,51 +12,83 @@ in libcufile = prev.libcufile.overrideAttrs (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ - prev.libcublas + final.libcublas.lib pkgs.numactl pkgs.rdma-core ]; # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = + ["libcuda.so.1"] + # Before 12.0 libcufile depends on itself for some reason. + ++ lib.optionals (cudaVersionOlder "12.0") [ + "libcufile.so.0" + ]; }); - libcusolver = final.addBuildInputs prev.libcusolver [ - prev.libcublas - ]; + libcusolver = final.addBuildInputs prev.libcusolver ( + # Always depends on this + [final.libcublas.lib] + # Dependency from 12.0 and on + ++ lib.optionals (cudaVersionAtLeast "12.0") [ + final.libnvjitlink.lib + ] + # Dependency from 12.1 and on + ++ lib.optionals (cudaVersionAtLeast "12.1") [ + final.libcusparse.lib + ] + ); - cuda_nvcc = prev.cuda_nvcc.overrideAttrs (oldAttrs: - let - inherit (prev.backendStdenv) cc; - in - { - # Required by cmake's enable_language(CUDA) to build a test program - # When implementing cross-compilation support: this is - # final.pkgs.targetPackages.cudaPackages.cuda_cudart - env.cudartRoot = "${prev.lib.getDev final.cuda_cudart}"; + libcusparse = final.addBuildInputs prev.libcusparse ( + lib.optionals (cudaVersionAtLeast "12.0") [ + final.libnvjitlink.lib + ] + ); - # Point NVCC at a compatible compiler + cuda_gdb = final.addBuildInputs prev.cuda_gdb ( + # x86_64 only needs gmp from 12.0 and on + lib.optionals (cudaVersionAtLeast "12.0") [ + pkgs.gmp + ] + ); - # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to - # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the - # setupCudaHook, i.e. we want it the hook to be propagated into the - # same nativeBuildInputs. - # - # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, - # so that the final offsets for the propagated hook would be `(-1, 0) + - # (0, 0) = (-1, 0)`. - # - # In practice, TargetTarget appears to work: - # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 - depsTargetTargetPropagated = [ - final.setupCudaHook - ]; - }); + cuda_nvcc = prev.cuda_nvcc.overrideAttrs (_: { + # Required by cmake's enable_language(CUDA) to build a test program + # When implementing cross-compilation support: this is + # final.pkgs.targetPackages.cudaPackages.cuda_cudart + env = { + # Given the multiple-outputs each CUDA redist has, we can specify the exact components we + # need from the package. CMake requires: + # - the cuda_runtime.h header, which is in the dev output + # - the dynamic library, which is in the lib output + # - the static library, which is in the static output + cudartInclude = "${final.cuda_cudart.dev}"; + cudartLib = "${final.cuda_cudart.lib}"; + cudartStatic = "${final.cuda_cudart.static}"; + }; + + # Point NVCC at a compatible compiler + + # Desiredata: whenever a package (e.g. magma) adds cuda_nvcc to + # nativeBuildInputs (offsets `(-1, 0)`), magma should also source the + # setupCudaHook, i.e. we want it the hook to be propagated into the + # same nativeBuildInputs. + # + # Logically, cuda_nvcc should include the hook in depsHostHostPropagated, + # so that the final offsets for the propagated hook would be `(-1, 0) + + # (0, 0) = (-1, 0)`. + # + # In practice, TargetTarget appears to work: + # https://gist.github.com/fd80ff142cd25e64603618a3700e7f82 + depsTargetTargetPropagated = [ + final.setupCudaHook + ]; + }); cuda_nvprof = prev.cuda_nvprof.overrideAttrs (oldAttrs: { nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.addOpenGLRunpath ]; - buildInputs = oldAttrs.buildInputs ++ [ prev.cuda_cupti ]; + buildInputs = oldAttrs.buildInputs ++ [ final.cuda_cupti.lib ]; # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; }); cuda_demo_suite = final.addBuildInputs prev.cuda_demo_suite [ @@ -62,8 +96,8 @@ in pkgs.libGLU pkgs.libglvnd pkgs.mesa - prev.libcufft - prev.libcurand + final.libcufft.lib + final.libcurand.lib ]; nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: { @@ -100,7 +134,7 @@ in nvidia_driver = prev.nvidia_driver.overrideAttrs (oldAttrs: { # libcuda needs to be resolved during runtime - autoPatchelfIgnoreMissingDeps = true; + autoPatchelfIgnoreMissingDeps = ["libcuda.so.1"]; # No need to support this package as we have drivers already # in linuxPackages. meta.broken = true; diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index e0a6ffd9d547..db85bfdd9c0b 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -1,6 +1,7 @@ { stdenv, backendStdenv, lib, + lndir, zlib, useCudatoolkitRunfile ? false, cudaVersion, @@ -10,14 +11,6 @@ autoPatchelfHook, autoAddOpenGLRunpathHook, fetchurl, - # The distributed version of CUDNN includes both dynamically liked .so files, - # as well as statically linked .a files. However, CUDNN is quite large - # (multiple gigabytes), so you can save some space in your nix store by - # removing the statically linked libraries if you are not using them. - # - # Setting this to true removes the statically linked .a files. - # Setting this to false keeps these statically linked .a files. - removeStatic ? false, }: { version, url, @@ -48,11 +41,16 @@ in backendStdenv.mkDerivation { pname = "cudatoolkit-${cudaMajorVersion}-cudnn"; version = versionTriple; + strictDeps = true; + outputs = ["out" "lib" "static" "dev"]; src = fetchurl { inherit url hash; }; + # We do need some other phases, like configurePhase, so the multiple-output setup hook works. + dontBuild = true; + # Check and normalize Runpath against DT_NEEDED using autoPatchelf. # Prepend /run/opengl-driver/lib using addOpenGLRunpath for dlopen("libcudacuda.so") nativeBuildInputs = [ @@ -74,27 +72,49 @@ in # # Note also that version <=8.3.0 contained a subdirectory "lib64/" but in # version 8.3.2 it seems to have been renamed to simply "lib/". + # + # doc and dev have special output handling. Other outputs need to be moved to their own + # output. + # Note that moveToOutput operates on all outputs: + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107 installPhase = '' runHook preInstall - mkdir -p $out - cp -a include $out/include - [ -d "lib/" ] && cp -a lib $out/lib - [ -d "lib64/" ] && cp -a lib64 $out/lib64 - '' - + strings.optionalString removeStatic '' - rm -f $out/lib/*.a - rm -f $out/lib64/*.a - '' - + '' + mkdir -p "$out" + mv * "$out" + moveToOutput "lib64" "$lib" + moveToOutput "lib" "$lib" + moveToOutput "**/*.a" "$static" + runHook postInstall ''; # Without --add-needed autoPatchelf forgets $ORIGIN on cuda>=8.0.5. postFixup = strings.optionalString (strings.versionAtLeast versionTriple "8.0.5") '' - patchelf $out/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so - patchelf $out/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + patchelf $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so + patchelf $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so + ''; + + # The out output leverages the same functionality which backs the `symlinkJoin` function in + # Nixpkgs: + # https://github.com/NixOS/nixpkgs/blob/d8b2a92df48f9b08d68b0132ce7adfbdbc1fbfac/pkgs/build-support/trivial-builders/default.nix#L510 + # + # That should allow us to emulate "fat" default outputs without having to actually create them. + # + # It is important that this run after the autoPatchelfHook, otherwise the symlinks in out will reference libraries in lib, creating a circular dependency. + postPhases = ["postPatchelf"]; + # For each output, create a symlink to it in the out output. + # NOTE: We must recreate the out output here, because the setup hook will have deleted it + # if it was empty. + # NOTE: Do not use optionalString based on whether `outputs` contains only `out` -- phases + # which are empty strings are skipped/unset and result in errors of the form "command not + # found: ". + postPatchelf = '' + mkdir -p "$out" + ${lib.meta.getExe lndir} "$lib" "$out" + ${lib.meta.getExe lndir} "$static" "$out" + ${lib.meta.getExe lndir} "$dev" "$out" ''; passthru = { @@ -111,6 +131,19 @@ in majorVersion = versions.major versionTriple; }; + # Setting propagatedBuildInputs to false will prevent outputs known to the multiple-outputs + # from depending on `out` by default. + # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L196 + # Indeed, we want to do the opposite -- fat "out" outputs that contain all the other outputs. + propagatedBuildOutputs = false; + + # By default, if the dev output exists it just uses that. + # However, because we disabled propagatedBuildOutputs, dev doesn't contain libraries or + # anything of the sort. To remedy this, we set outputSpecified to true, and use + # outputsToInstall, which tells Nix which outputs to use when the package name is used + # unqualified (that is, without an explicit output). + outputSpecified = true; + 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 @@ -127,5 +160,8 @@ in license = licenses.unfree; platforms = ["x86_64-linux"]; maintainers = with maintainers; [mdaiter samuela]; + # Force the use of the default, fat output by default (even though `dev` exists, which + # causes Nix to prefer that output over the others if outputSpecified isn't set). + outputsToInstall = ["out"]; }; } diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 04f263568ce6..b3753a63339a 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -113,13 +113,17 @@ stdenv.mkDerivation { lapack blas ] ++ lists.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - libcublas # cublas_v2.h - libcusparse # cusparse.h + cuda_cudart.dev # cuda_runtime.h + cuda_cudart.lib # cudart + cuda_cudart.static # cudart_static + libcublas.dev # cublas_v2.h + libcublas.lib # cublas + libcusparse.dev # cusparse.h + libcusparse.lib # cusparse ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ - cuda_nvprof # + cuda_nvprof.dev # ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ - cuda_profiler_api # + cuda_profiler_api.dev # ]) ++ lists.optionals rocmSupport [ hip hipblas diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 1d9fd2a469f6..0dcc2fdba2d9 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -196,7 +196,8 @@ in buildPythonPackage rec { export TORCH_CUDA_ARCH_LIST="${gpuTargetString}" export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '' + lib.optionalString (cudaSupport && cudnn != null) '' - export CUDNN_INCLUDE_DIR=${cudnn}/include + export CUDNN_INCLUDE_DIR=${cudnn.dev}/include + export CUDNN_LIB_DIR=${cudnn.lib}/lib '' + lib.optionalString rocmSupport '' export ROCM_PATH=${rocmtoolkit_joined} export ROCM_SOURCE_DIR=${rocmtoolkit_joined} @@ -290,7 +291,7 @@ in buildPythonPackage rec { buildInputs = [ blas blas.provider pybind11 ] ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now - ++ lib.optionals cudaSupport [ cudnn nccl ] + ++ lib.optionals cudaSupport [ cudnn.dev cudnn.lib nccl ] ++ lib.optionals rocmSupport [ openmp ] ++ lib.optionals (cudaSupport || rocmSupport) [ magma ] ++ lib.optionals stdenv.isLinux [ numactl ] From 9a4cab8f974ab199354752cb53017800da8054b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 03:38:06 +0000 Subject: [PATCH 122/221] vkd3d: 1.7.1 -> 1.8 --- pkgs/development/libraries/vkd3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vkd3d/default.nix b/pkgs/development/libraries/vkd3d/default.nix index 928cf2e78a23..77a275b20df5 100644 --- a/pkgs/development/libraries/vkd3d/default.nix +++ b/pkgs/development/libraries/vkd3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.7.1"; + version = "1.8"; nativeBuildInputs = [ autoreconfHook pkg-config wine flex bison ]; buildInputs = [ vulkan-loader vulkan-headers spirv-headers ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "wine"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-4WUD6bRG/XwrOb5tl0ZyaaR0uy85eYXcb16eDeumOAQ="; + sha256 = "sha256-v2UhJvfB5Clupmgoykei3AoWYBOp5l9pQFkUEQVlajs="; }; meta = with lib; { From ac635405a648b15bc99021a94eb618fa42ef508f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 03:56:05 +0000 Subject: [PATCH 123/221] joker: 1.2.0 -> 1.3.0 --- pkgs/development/interpreters/joker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 511cf691e28a..30b7aabbcdcd 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-hNwDX2yg7J8rcR9QRSGgqFTeqH+ydyDtPbIGC2nK5RI="; + sha256 = "sha256-D9maTCNNJ9ivj76SEjddFSYNu+RLEZG+3SgOWEAD7aU="; }; - vendorHash = "sha256-DrVtT2OBNquWVp/8Je45dBPDXafEc2Q+jffwY2S8J80="; + vendorHash = "sha256-ioC7R5Pm2nmHXI+/ko1UoNJCvEFzvhZcAcVtaFECz2c="; doCheck = false; From a2c4950424131566737e0287ffa06055b2643127 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 03:06:59 +0000 Subject: [PATCH 124/221] terraform-providers.baiducloud: 1.19.14 -> 1.19.15 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 33c60aa07920..1268a2f533f7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -146,11 +146,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-eey651CgiJ+pDhLD/S75qQ7nMRJgVhubVeZn1xXleKw=", + "hash": "sha256-5tydl+IMHz1wYxNUHJY6l+yIgtjc0gy5ufa+DQHiNf0=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.14", + "rev": "v1.19.15", "spdx": "MPL-2.0", "vendorHash": null }, From 4c3c02816912b279cf6521d29a23dff50fd717a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 03:09:33 +0000 Subject: [PATCH 125/221] terraform-providers.launchdarkly: 2.15.0 -> 2.15.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1268a2f533f7..8945c70e3db0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -664,11 +664,11 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-gXT/rBlucBjg+8cjpSXdlClFGNuWmq6tZuuMfsBhR2E=", + "hash": "sha256-sIu+3Vu99wxcA+fdYMXRMZzK7RpUlV37136wyn5H4WQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.15.0", + "rev": "v2.15.1", "spdx": "MPL-2.0", "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q=" }, From cc72803f18e0053cb8c12d44085a12e59f4de70d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 03:12:09 +0000 Subject: [PATCH 126/221] terraform-providers.pagerduty: 2.16.1 -> 2.16.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8945c70e3db0..6f88a1ead094 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -899,11 +899,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-EJN2kf4MghIG38kEzyzafTEwxBytm5nyMA9f+bYM7ng=", + "hash": "sha256-wVXGDWpKVujS5FfvDM7quCuXRFP2MBlJra7qTyFJgDM=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.16.1", + "rev": "v2.16.2", "spdx": "MPL-2.0", "vendorHash": null }, From 3d56af83f36b12bbca210ecf369dd8b06813716d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 03:17:43 +0000 Subject: [PATCH 127/221] terraform-providers.oci: 5.10.0 -> 5.11.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6f88a1ead094..406a70417274 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -827,11 +827,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-S+gHfQsqnOlegd5JcuBOUKO7fynWQAWCZGrlqjY03e0=", + "hash": "sha256-xZHk/rkq2H4Bkr+ugTHrkb4Al2ky0zOWEQmZtiXV48s=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.10.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", "vendorHash": null }, From dfe66fc6dfff137140ca32d8d628f1292d5fa172 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 03:19:52 +0000 Subject: [PATCH 128/221] terraform-providers.vault: 3.19.0 -> 3.20.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 406a70417274..5631b6ba74d1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1197,12 +1197,12 @@ "vendorHash": "sha256-D7geLjmJoelbHolyS5IhnGNNl6kD8ZGtCRWcy+j2dxA=" }, "vault": { - "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=", + "hash": "sha256-IPVD4VVC6jn3BWltqfCk2+GFSkQRNK7jkJ3/QmgBxqg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.19.0", + "rev": "v3.20.0", "spdx": "MPL-2.0", "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0=" }, From d7a2dfe6dd9871f3d29c50e281b47afe3fdb9b28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 04:25:12 +0000 Subject: [PATCH 129/221] werf: 1.2.252 -> 1.2.253 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 10ffe01467f8..632fcaee21d1 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.252"; + version = "1.2.253"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-dKbdEkC0+HFRWsOIteNDlKc1FHB24ECWyOqrVW9MITY="; + hash = "sha256-cHMMLV2NdYueL3qV0wpB4n0+2XZTvg4mfKTSgGZHqqY="; }; - vendorHash = "sha256-0PQDMncERGrPI5sSx76jE7MAz49CYvSORMa/Gc19agA="; + vendorHash = "sha256-vuEqimNRWQGwybzOkGVoevpyVpU8XyXqhAIa7I66ajs="; proxyVendor = true; From 20f321c847295367305364c78c0b002a79eee82d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 04:57:36 +0000 Subject: [PATCH 130/221] go-jet: 2.10.0 -> 2.10.1 --- pkgs/development/tools/go-jet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-jet/default.nix b/pkgs/development/tools/go-jet/default.nix index 2f20c8d3ca49..aea629bebefe 100644 --- a/pkgs/development/tools/go-jet/default.nix +++ b/pkgs/development/tools/go-jet/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jet"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = pname; repo = "jet"; rev = "v${version}"; - sha256 = "sha256-Dj/Bq7MEM2sIhz1ThvRpO9wYCasISvd8icP68LVXEx0="; + sha256 = "sha256-G/yKS4YFKOVkuoqT/Qh12ul43dKo4W23EIyCgmeaUoo="; }; vendorHash = "sha256-AwrtLTzKqKjFf5fV3JWYWyaqzHJjMNrYuSXhHXyV5HE="; From a86b37a5695bc385ae52b97e9b152b49066435a7 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 31 Aug 2023 07:40:58 +0200 Subject: [PATCH 131/221] mu: 1.10.6 -> 1.10.7 https://github.com/djcb/mu/releases/tag/v1.10.7 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 4ed161ba355f..06083f8e0fae 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.10.6"; + version = "1.10.7"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-AGHPczGh4z0bla034FGSTmaRgMIfBNYFBUPevJ9LHqI="; + hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI="; }; postPatch = '' From 9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dimitrije=20Radojevi=C4=87?= Date: Thu, 31 Aug 2023 06:46:20 +0100 Subject: [PATCH 132/221] ocamlPackages.janestreet: 0.15 -> 0.16 (#247022) --- .../coq-modules/serapi/default.nix | 4 + .../coq-modules/serapi/janestreet-0.16.patch | 17 + .../ocaml-modules/bistro/default.nix | 2 + .../bistro/janestreet-0.16.patch | 205 +++ .../ocaml-modules/cfstream/default.nix | 2 +- .../cfstream/janestreet-0.16.patch | 36 + .../ocaml-modules/janestreet/0.16.nix | 1223 +++++++++++++++++ .../janestreet/janePackage_0_16.nix | 30 + pkgs/development/ocaml-modules/tls/async.nix | 8 +- .../ocaml-modules/tls/janestreet-0.16.patch | 23 + pkgs/development/tools/comby/comby.patch | 142 +- pkgs/top-level/all-packages.nix | 5 +- pkgs/top-level/ocaml-packages.nix | 99 +- 13 files changed, 1771 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/coq-modules/serapi/janestreet-0.16.patch create mode 100644 pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch create mode 100644 pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch create mode 100644 pkgs/development/ocaml-modules/janestreet/0.16.nix create mode 100644 pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix create mode 100644 pkgs/development/ocaml-modules/tls/janestreet-0.16.patch diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index ac09d26935af..b33c89aa63c1 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -87,6 +87,10 @@ in then [ ./janestreet-0.15.patch ] + else if version == "8.17.0+0.17.0" + then [ + ./janestreet-0.16.patch + ] else [ ]; diff --git a/pkgs/development/coq-modules/serapi/janestreet-0.16.patch b/pkgs/development/coq-modules/serapi/janestreet-0.16.patch new file mode 100644 index 000000000000..01aac57639ad --- /dev/null +++ b/pkgs/development/coq-modules/serapi/janestreet-0.16.patch @@ -0,0 +1,17 @@ +diff --git a/serlib/ser_stdlib.ml b/serlib/ser_stdlib.ml +index 894d300..11c9217 100644 +--- a/serlib/ser_stdlib.ml ++++ b/serlib/ser_stdlib.ml +@@ -28,6 +28,7 @@ let ref_to_yojson f x = f !x + let ref_of_yojson f x = Result.map (fun x -> ref x) (f x) + let hash_fold_ref = hash_fold_ref_frozen + let compare_ref = compare_ref ++let (==) x y = (==) x y + + module Lazy = struct + type 'a t = 'a lazy_t +@@ -35,3 +36,4 @@ module Lazy = struct + end + + module Option = Stdlib.Option ++module List = Stdlib.List diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index 8f84a973bf0f..fd409b51091d 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -29,6 +29,8 @@ buildDunePackage rec { sha256 = "0g11324j1s2631zzf7zxc8s0nqd4fwvcni0kbvfpfxg96gy2wwfm"; }; + patches = [ ./janestreet-0.16.patch ]; + propagatedBuildInputs = [ base64 bos diff --git a/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch b/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch new file mode 100644 index 000000000000..bf3b41eb4ac8 --- /dev/null +++ b/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch @@ -0,0 +1,205 @@ +diff --git a/lib/engine/scheduler.ml b/lib/engine/scheduler.ml +index e32bd0f..93b566b 100644 +--- a/lib/engine/scheduler.ml ++++ b/lib/engine/scheduler.ml +@@ -601,7 +601,7 @@ module Make(Backend : Backend) = struct + ) + ) + | Trywith tw -> ( +- match Table.find sched.traces (Workflow.id tw.w) with ++ match Hashtbl.find sched.traces (Workflow.id tw.w) with + | Some eventual_trace -> ( + eventual_trace >>= function + | Ok (Run r) -> +@@ -667,10 +667,10 @@ module Make(Backend : Backend) = struct + let register_build sched ~id ~build_trace = + let open Eval_thread.Infix in + ( +- match Table.find sched.traces id with ++ match Hashtbl.find sched.traces id with + | None -> + let trace = build_trace () in +- Table.set sched.traces ~key:id ~data:trace ; ++ Hashtbl.set sched.traces ~key:id ~data:trace ; + trace + | Some trace -> trace + ) >>= fun trace -> +@@ -854,7 +854,7 @@ module Make(Backend : Backend) = struct + Eval_thread.join l.elts ~f:(build ?target sched) + | Trywith tw -> ( + build sched ?target tw.w >> fun w_result -> +- match Table.find sched.traces (Workflow.id tw.w) with ++ match Hashtbl.find sched.traces (Workflow.id tw.w) with + | Some eventual_trace -> ( + eventual_trace >> function + | Ok (Run r) when run_trywith_recovery r.details -> +diff --git a/lib/multinode/bistro_multinode.ml b/lib/multinode/bistro_multinode.ml +index 01dc5ac..3fc6b0e 100644 +--- a/lib/multinode/bistro_multinode.ml ++++ b/lib/multinode/bistro_multinode.ml +@@ -130,7 +130,7 @@ module Server = struct + let search (type s) (table : s String.Table.t) ~f = + let module M = struct exception Found of string * s end in + try +- String.Table.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; ++ Hashtbl.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ; + None + with M.Found (k, v) -> Some (k, v) + +@@ -145,7 +145,7 @@ module Server = struct + match allocation_attempt with + | None -> Some elt + | Some (worker_id, (Resource curr)) -> +- String.Table.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; ++ Hashtbl.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ; + Lwt.wakeup u (worker_id, Resource { np ; mem }) ; + None + ) +@@ -163,12 +163,12 @@ module Server = struct + t + + let add_worker pool (Worker { id ; np ; mem ; _ }) = +- match String.Table.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with ++ match Hashtbl.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with + | `Ok -> allocation_pass pool + | `Duplicate -> failwith "A worker has been added twice" + + let release pool worker_id (Allocator.Resource { np ; mem }) = +- String.Table.update pool.available worker_id ~f:(function ++ Hashtbl.update pool.available worker_id ~f:(function + | None -> failwith "Tried to release resources of inexistent worker" + | Some (Resource r) -> Resource { np = r.np + np ; mem = r.mem + mem } + ) +@@ -235,13 +235,13 @@ module Server = struct + | Subscript { np ; mem } -> + let id = new_id () in + let w = create_worker ~np ~mem id in +- String.Table.set state.workers ~key:id ~data:w ; ++ Hashtbl.set state.workers ~key:id ~data:w ; + Worker_allocator.add_worker state.alloc w ; + log (Logger.Debug (sprintf "new worker %s" id)) ; + Lwt.return (Client_id id) + + | Get_job { client_id } -> ( +- match String.Table.find state.workers client_id with ++ match Hashtbl.find state.workers client_id with + | None -> Lwt.return None + | Some (Worker worker) -> + Lwt.choose [ +@@ -250,22 +250,22 @@ module Server = struct + ] >>= function + | `Job wp -> + let workflow_id = workflow_id_of_job_waiter wp in +- String.Table.set worker.running_jobs ~key:workflow_id ~data:wp ; ++ Hashtbl.set worker.running_jobs ~key:workflow_id ~data:wp ; + Lwt.return (Some (job_of_job_waiter wp)) + | `Stop -> Lwt.return None + ) + + | Plugin_result r -> +- let Worker worker = String.Table.find_exn state.workers r.client_id in ++ let Worker worker = Hashtbl.find_exn state.workers r.client_id in + Lwt.return ( +- match String.Table.find_exn worker.running_jobs r.workflow_id with ++ match Hashtbl.find_exn worker.running_jobs r.workflow_id with + | Waiting_plugin wp -> Lwt.wakeup wp.waiter r.result + | Waiting_shell_command _ -> assert false (* should never happen *) + ) + | Shell_command_result r -> +- let Worker worker = String.Table.find_exn state.workers r.client_id in ++ let Worker worker = Hashtbl.find_exn state.workers r.client_id in + Lwt.return ( +- match String.Table.find_exn worker.running_jobs r.workflow_id with ++ match Hashtbl.find_exn worker.running_jobs r.workflow_id with + | Waiting_plugin _ -> assert false (* should never happen *) + | Waiting_shell_command wp -> Lwt.wakeup wp.waiter r.result + ) +@@ -307,7 +307,7 @@ module Server = struct + + let request_resource backend req = + Worker_allocator.request backend.state.alloc req >|= fun (worker_id, resource) -> +- String.Table.find_exn backend.state.workers worker_id, resource ++ Hashtbl.find_exn backend.state.workers worker_id, resource + + let release_resource backend worker_id res = + Worker_allocator.release backend.state.alloc worker_id res +@@ -334,7 +334,7 @@ module Server = struct + * loop () *) + + let eval backend { worker_id ; workflow_id } f x = +- let Worker worker = String.Table.find_exn backend.state.workers worker_id in ++ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in + let f () = f x in + let t, u = Lwt.wait () in + let job_waiter = Waiting_plugin { waiter = u ; f ; workflow_id } in +@@ -342,7 +342,7 @@ module Server = struct + t + + let run_shell_command backend { worker_id ; workflow_id } cmd = +- let Worker worker = String.Table.find_exn backend.state.workers worker_id in ++ let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in + let t, u = Lwt.wait () in + let job = Waiting_shell_command { waiter = u ; cmd ; workflow_id } in + Lwt_queue.push worker.pending_jobs job ; +diff --git a/lib/utils/dot_output.ml b/lib/utils/dot_output.ml +index 90c299f..d13fceb 100644 +--- a/lib/utils/dot_output.ml ++++ b/lib/utils/dot_output.ml +@@ -24,7 +24,7 @@ module G = struct + (* let successors g u = fold_succ (fun h t -> h :: t) g u [] *) + + let rec of_workflow_aux seen acc u = +- if S.mem seen u then (seen, acc) ++ if Set.mem seen u then (seen, acc) + else ( + let deps = W.Any.deps u in + let seen, acc = +@@ -34,7 +34,7 @@ module G = struct + in + let acc = add_vertex acc u in + let acc = List.fold deps ~init:acc ~f:(fun acc v -> add_edge acc u v) in +- let seen = S.add seen u in ++ let seen = Set.add seen u in + seen, acc + ) + +@@ -109,7 +109,7 @@ let dot_output ?db oc g ~needed = + ] + in + let vertex_attributes u = +- let needed = (match db with None -> true | Some _ -> false) || S.mem needed u in ++ let needed = (match db with None -> true | Some _ -> false) || Set.mem needed u in + let color = if needed then black else light_gray in + let shape = `Shape (shape u) in + let W.Any w = u in +@@ -141,7 +141,7 @@ let dot_output ?db oc g ~needed = + | _ -> [] + in + let color = +- if (match db with None -> true | Some _ -> false) || (S.mem needed u && not (already_done u)) ++ if (match db with None -> true | Some _ -> false) || (Set.mem needed u && not (already_done u)) + then black else light_gray in + style @ [ `Color color ] + in +diff --git a/lib/utils/repo.ml b/lib/utils/repo.ml +index 06abcd5..206a99e 100644 +--- a/lib/utils/repo.ml ++++ b/lib/utils/repo.ml +@@ -160,7 +160,7 @@ let protected_set repo = + | Select s -> fold_path_workflow acc (W.Any s.dir) + | Input _ -> acc + | Shell _ +- | Plugin _ -> String.Set.add acc (W.id w) ++ | Plugin _ -> Set.add acc (W.id w) + | Trywith tw -> + fold_path_workflow (fold_path_workflow acc (W.Any tw.w)) (W.Any tw.failsafe) + | Ifelse ie -> +@@ -187,7 +187,7 @@ let cache_clip_fold ~bistro_dir repo ~f ~init = + let protected = protected_set repo in + let db = Db.init_exn bistro_dir in + Db.fold_cache db ~init ~f:(fun acc id -> +- f db acc (if String.Set.mem protected id then `Protected id else `Unprotected id) ++ f db acc (if Set.mem protected id then `Protected id else `Unprotected id) + ) + + let cache_clip_dry_run ~bistro_dir repo = diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index 22e78c1aeeb2..af721b63a8f9 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ="; }; - patches = [ ./git_commit.patch ]; + patches = [ ./git_commit.patch ./janestreet-0.16.patch ]; strictDeps = true; diff --git a/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch b/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch new file mode 100644 index 000000000000..afc665f30426 --- /dev/null +++ b/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch @@ -0,0 +1,36 @@ +diff --git a/lib/CFStream_stream.ml b/lib/CFStream_stream.ml +index 25c0e5a..94da2e3 100644 +--- a/lib/CFStream_stream.ml ++++ b/lib/CFStream_stream.ml +@@ -287,7 +287,7 @@ let group_aux xs map eq = + ;; + + let group xs ~f = group_aux xs f Poly.( = ) +-let group_by xs ~eq = group_aux xs ident eq ++let group_by xs ~eq = group_aux xs Fn.id eq + + let chunk2 xs = + from (fun _ -> +@@ -615,11 +615,11 @@ let to_hashtbl xs = + let of_map t = of_list (Map.to_alist t) + + let to_map xs = +- fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.Poly.set accu ~key ~data) ++ fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.set accu ~key ~data) + ;; + + let of_set t = of_list (Set.to_list t) +-let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.Poly.add accu e) ++let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.add accu e) + + module Infix = struct + let ( -- ) x y = range x ~until:y +@@ -660,7 +660,7 @@ module Result = struct + | M.E e -> Result.Error e + ;; + +- let all xs ~f = all_gen ident xs ~f ++ let all xs ~f = all_gen Fn.id xs ~f + let all' xs ~f = all_gen (fun x -> Ok x) xs ~f + let to_exn = result_to_exn + diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix new file mode 100644 index 000000000000..8adec0c53cfa --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -0,0 +1,1223 @@ +{ self +, bash +, fetchpatch +, fzf +, lib +, openssl +, zstd +}: + +with self; + +{ + + abstract_algebra = janePackage { + pname = "abstract_algebra"; + hash = "sha256-hAZzc2ypbGE/8mxxk4GZqr17JlIYv71gZJMQ4plsK38="; + meta.description = "A small library describing abstract algebra concepts"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + accessor = janePackage { + pname = "accessor"; + hash = "sha256-yClfUXqwVoipF4WqbqC6VBVYc6t8MZYVoHGjchH7XQA="; + meta.description = "A library that makes it nicer to work with nested functional data structures"; + propagatedBuildInputs = [ higher_kinded ]; + }; + + accessor_async = janePackage { + pname = "accessor_async"; + hash = "sha256-kGT7aFNOgU8/2ez9L/lefb2LN7I87+WthZHnb+dY9PE="; + meta.description = "Accessors for Async types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_core async_kernel ]; + }; + + accessor_base = janePackage { + pname = "accessor_base"; + hash = "sha256-idnSNP6kfoV3I8QAMJ2YoUrewBpyte+0/C371aMTIxo="; + meta.description = "Accessors for Base types, for use with the Accessor library"; + propagatedBuildInputs = [ ppx_accessor ]; + }; + + accessor_core = janePackage { + pname = "accessor_core"; + hash = "sha256-f4s/I+xDi/aca1WgaE+P3CD4e80jenS0WHg4T1Stcbg="; + meta.description = "Accessors for Core types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_base core_kernel ]; + }; + + async = janePackage { + pname = "async"; + hash = "sha256-TpsC9sn8noiNI0aYbMalUUv3xlC2LMERsv6Gr928Vzc="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; + doCheck = false; # we don't have netkit_sockets + }; + + async_durable = janePackage { + pname = "async_durable"; + hash = "sha256-PImYpM9xNFUWeWRld4jFwWBRowUP1iXzdxkK/fP/rHE="; + meta.description = "Durable connections for use with async"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel core core_kernel ppx_jane ]; + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "sha256-Y+gTlJuKmwvEEPuMPu7v0iYeNQtlzP8QiS0PSgoYrrI="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "sha256-PG6BJx9tfP+zcDaG+7WdHiv4jUqsUH2TvHV6UXdzPAg="; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + async_inotify = janePackage { + pname = "async_inotify"; + hash = "sha256-seFbs06w3T+B49sw3nOjpXpoJbJ+IJ3qN5LnufrsE48="; + meta.description = "Async wrapper for inotify"; + propagatedBuildInputs = [ async_find inotify ]; + }; + + async_interactive = janePackage { + pname = "async_interactive"; + hash = "sha256-xZKVT8L2rOLBeg7wK0tD6twhkDfwQp5ZKy4DPp1UWq8="; + meta.description = "Utilities for building simple command-line based user interfaces"; + propagatedBuildInputs = [ async ]; + }; + + async_js = janePackage { + pname = "async_js"; + hash = "sha256-JyF1busOv9JWxp55oaxBozIQyCKlmAY3csBA4/98qy0="; + meta.description = "A small library that provide Async support for JavaScript platforms"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_rpc_kernel js_of_ocaml uri-sexp ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "sha256-EDgdZc6GRyiiFtnElNE9jGPEjPIUniP9uB/JoySkZz8="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "sha256-OccFMfhTRSQwx1LJcN8OkDpA62KabsyWn2hox84jqow="; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_rpc_websocket = janePackage { + pname = "async_rpc_websocket"; + hash = "sha256-S3xIw/mew9YhtenWfp8ZD82WtOQSzJHtreT1+kRivus="; + meta.description = "Library to serve and dispatch Async RPCs over websockets"; + propagatedBuildInputs = [ async_rpc_kernel async_websocket cohttp_async_websocket ]; + }; + + async_sendfile = janePackage { + pname = "async_sendfile"; + hash = "sha256-ykl87/De56gz6JRQfTIeWrU823PT2fnFJr08GxuDYic="; + meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files"; + propagatedBuildInputs = [ async_unix ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "sha256-DjIbadCjPymnkDsnonmxKumCWf5P9XO3ZaAwOaYRnbk="; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + async_smtp = janePackage { + pname = "async_smtp"; + hash = "sha256-X0eegZMMU9EnC9Oi+6DjtwNmyzQYr3EKi1duNzEAfkk="; + meta.description = "SMTP client and server"; + propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ]; + }; + + async_ssl = janePackage { + pname = "async_ssl"; + hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4="; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "sha256-dT+yJC73sxS4NPR/GC/FyVLbWtYpM9DqKykVk8PEEWU="; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core_unix ]; + }; + + async_websocket = janePackage { + pname = "async_websocket"; + hash = "sha256-Qy+A8ee6u5Vr05FNeaH/6Sdp9bcq3cnaDYO9OU06VW0="; + meta.description = "A library that implements the websocket protocol on top of Async"; + propagatedBuildInputs = [ async cryptokit ]; + }; + + babel = janePackage { + pname = "babel"; + hash = "sha256-nnMliU0d6vtHTYEy9uMi8nMaHvAsEXKN6uNByqZ28+c="; + meta.description = "A library for defining Rpcs that can evolve over time without breaking backward compatibility"; + propagatedBuildInputs = [ async_rpc_kernel core ppx_jane streamable tilde_f ]; + }; + + base = janePackage { + pname = "base"; + version = "0.16.2"; + hash = "sha256-8OvZe+aiWipJ6busBufx3OqERmqxBva55UOLjL8KoPc="; + meta.description = "Full standard library replacement for OCaml"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ sexplib0 ]; + checkInputs = [ alcotest ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "sha256-gQbzdr05DEowzd0k9JBTF0gGMwlaVwTVJuoKZ0u9voU="; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ int_repr ppx_jane ]; + }; + + base_trie = janePackage { + pname = "base_trie"; + hash = "sha256-KV/k3B0h/4rE+MY6f4qDnlaObMmewUS+NAN2M7sb+yw="; + meta.description = "Trie data structure library"; + propagatedBuildInputs = [ base core expect_test_helpers_core ppx_jane ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "sha256-9Flg8vAoT6f+3lw9wETQhsaA1fSsQiqKeEhzo0qtDu4="; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ]; + }; + + bidirectional_map = janePackage { + pname = "bidirectional_map"; + hash = "sha256-YEzOdzanBJaskI2/xN9E3ozWnBXDyxJvY3g/qEE73yI="; + meta.description = "A library for bidirectional maps and multimaps"; + }; + + bignum = janePackage { + pname = "bignum"; + hash = "sha256-PmvqGImF1Nrr6swx5q3+9mCfSbieC3RvWuz8oCTkSgg="; + propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "sha256-qFkM6TrTLnnFKmzQHktBb68HpBTMYhiURvnRKEoAevk="; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_optcomp ppx_stable_witness ppx_variants_conv ]; + }; + + bonsai = janePackage { + pname = "bonsai"; + hash = "sha256-YJ+qkVG5PLBmioa1gP7y6jwn82smyyYDIwHwhDqNeWM="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ ppx_pattern_bind ]; + nativeBuildInputs = [ ppx_css js_of_ocaml-compiler ocaml-embed-file ]; + propagatedBuildInputs = [ + async + async_durable + async_extra + async_rpc_websocket + babel + cohttp-async + core_bench + fuzzy_match + incr_dom + indentation_buffer + js_of_ocaml-ppx + ordinal_abbreviation + patdiff + polling_state_rpc + ppx_css + ppx_typed_fields + profunctor + sexp_grammar + textutils + ]; + }; + + cinaps = janePackage { + pname = "cinaps"; + version = "0.15.1"; + hash = "sha256-LycruanldSP251uYJjQqIfI76W0UQ6o5i5u8XjszBT0="; + meta.description = "Trivial metaprogramming tool"; + minimalOCamlVersion = "4.04"; + propagatedBuildInputs = [ re ]; + doCheck = false; # fails because ppx_base doesn't include ppx_js_style + }; + + cohttp_async_websocket = janePackage { + pname = "cohttp_async_websocket"; + hash = "sha256-OBtyKMyvfz0KNG4SWmvoTMVPnVTpO12N38q+kEbegJE="; + meta.description = "Websocket library for use with cohttp and async"; + propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + }; + + cohttp_static_handler = janePackage { + pname = "cohttp_static_handler"; + hash = "sha256-7NCnJVArudBEvWARQUGlJuEq3kSCjpn5YtsLsL04bf4="; + meta.description = "A library for easily creating a cohttp handler for static files"; + propagatedBuildInputs = [ cohttp-async ]; + }; + + content_security_policy = janePackage { + pname = "content_security_policy"; + hash = "sha256-q/J+ZzeC6txyuRQzR8Hmu7cYJCQbxaMlVEmK8fj0hus="; + meta.description = "A library for building content-security policies"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + core = janePackage { + pname = "core"; + version = "0.16.1"; + hash = "sha256-cKJi67VLIsbLEgIZyFiVz00z/QEvJhNBb8+M+bR4iHU="; + meta.description = "Industrial strength alternative to OCaml's standard library"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; + doCheck = false; # circular dependency with core_kernel + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "sha256-ASdu3ZUk+nkdNX9UbBQxKRdXBa073mWMDRW+Ceu3/t4="; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "sha256-hcjmFDdVKCHK8u6D4Qn2a/HYTEZOvkXHcB6BTpbjF/s="; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core_unix record_builder ]; + }; + + core_kernel = janePackage { + pname = "core_kernel"; + hash = "sha256-YB3WMNLePrOKu+mmVedNo0pWN9x5fIaBxJsby56TFJU="; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring core int_repr sexplib ]; + doCheck = false; # we don't have quickcheck_deprecated + }; + + core_unix = janePackage { + pname = "core_unix"; + hash = "sha256-mePpxjbUumMemHDKhRgACilchgS6QHZEV1ghYtT3flg="; + meta.description = "Unix-specific portions of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel expect_test_helpers_core ocaml_intrinsics ppx_jane timezone spawn ]; + postPatch = '' + patchShebangs unix_pseudo_terminal/src/discover.sh + ''; + }; + + csvfields = janePackage { + pname = "csvfields"; + hash = "sha256-FEkjRmLeqNvauBlrY2xtLZfxVfnFWU8w8noEArPUieo="; + propagatedBuildInputs = [ core num ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + dedent = janePackage { + pname = "dedent"; + hash = "sha256-fzytLr3tVr2vPmykUBzNFMxnyMcIeeo8S9BydsTKnQw="; + propagatedBuildInputs = [ base ppx_jane stdio ]; + meta.description = "A library for improving redability of multi-line string constants in code"; + }; + + delimited_parsing = janePackage { + pname = "delimited_parsing"; + hash = "sha256-XyO3hzPz48i1cnMTJvZfarM6HC7qdHqdftp9SnCjPEU="; + propagatedBuildInputs = [ async core_extended ]; + meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; + }; + + diffable = janePackage { + pname = "diffable"; + hash = "sha256-ascQUbxzvRR8XrroaupyFZ2YNQMvlXn4PemumYTwRF4="; + propagatedBuildInputs = [ core ppx_jane stored_reversed streamable ]; + meta.description = "An interface for diffs"; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "sha256-VS7eTTD85ci3mJIXd2pG1Y/ygT9dCIvfzU2HtOufW6U="; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + email_message = janePackage { + pname = "email_message"; + hash = "sha256-eso68owbAspjaVgj/wGFQ7VQYlAwyYV3oNitLQWiRPA="; + meta.description = "E-mail message parser"; + propagatedBuildInputs = [ angstrom async base64 cryptokit magic-mime re2 ]; + }; + + env_config = janePackage { + pname = "env_config"; + hash = "sha256-CvvpKI7F40DVC7iByrzCqW1ilPiIhdDPYaJrDoUZVSs="; + meta.description = "Helper library for retrieving configuration from an environment variable"; + propagatedBuildInputs = [ async core core_unix ppx_jane ]; + }; + + expect_test_helpers_async = janePackage { + pname = "expect_test_helpers_async"; + hash = "sha256-dEvOMb1aCEt05XtkKIC9jWoIQ/2zM0Gj+K/ZN3bFjeI="; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + expect_test_helpers_core = janePackage { + pname = "expect_test_helpers_core"; + hash = "sha256-8DsMwk9WhQQ7iMNYSFBglfbcgvE5dySt4J4qjzJ3dJk="; + meta.description = "Helpers for writing expectation tests"; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "sha256-dwkO65sBsPfTF0F2FKrnttEjhAY2OMbJetSgOfUXk3A="; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + file_path = janePackage { + pname = "file_path"; + hash = "sha256-EEpDZNgUgyeqivRhZgQWWlerl+7OOcvAbjjQ3e1NYOQ="; + meta.description = + "A library for typed manipulation of UNIX-style file paths"; + propagatedBuildInputs = [ + async + core + core_kernel + core_unix + expect_test_helpers_async + expect_test_helpers_core + ppx_jane + ]; + }; + + fuzzy_match = janePackage { + pname = "fuzzy_match"; + hash = "sha256-M3yOqP0/OZFbqZZpgDdhJ/FZU3MhKwIXbWjwuMlxe2Q="; + meta.description = "A library for fuzzy string matching"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + fzf = janePackage { + pname = "fzf"; + hash = "sha256-IQ2wze34LlOutecDOrPhj3U7MFVJTSjQW+If3QyHoes="; + meta.description = "A library for running the fzf command line tool"; + propagatedBuildInputs = [ async core_kernel ppx_jane ]; + postPatch = '' + substituteInPlace src/fzf.ml --replace /usr/bin/fzf ${fzf}/bin/fzf + ''; + }; + + higher_kinded = janePackage { + pname = "higher_kinded"; + hash = "sha256-aCpYc7f4mrPsGp038YabEyw72cA6GbCKsok+5Hej5P0="; + meta.description = "A library with an encoding of higher kinded types in OCaml"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + incr_dom = janePackage { + pname = "incr_dom"; + hash = "sha256-fnD/YnaGK6MIy/fL6bDwcoGDJhHo2+1l8dCXxwN28kg="; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ]; + }; + + incr_map = janePackage { + pname = "incr_map"; + hash = "sha256-D3ZD0C4YfZOfXw+3CtqL8DKcz+b06UL8AF7Rf9x+hps="; + meta.description = "Helpers for incremental operations on map like data structures"; + buildInputs = [ ppx_pattern_bind ]; + propagatedBuildInputs = [ abstract_algebra bignum diffable incremental streamable ]; + }; + + incr_select = janePackage { + pname = "incr_select"; + hash = "sha256-gRUF0QsDaZfHU7Mexl5nR8xCN+65v28/r/ciueR5NdE="; + meta.description = "Handling of large set of incremental outputs from a single input"; + propagatedBuildInputs = [ incremental ]; + }; + + incremental = janePackage { + pname = "incremental"; + hash = "sha256-PXGY0M2xeVWDLeS3SrqXy1dqsyeKgndGT6NpuiyNQQQ="; + meta.description = "Library for incremental computations"; + propagatedBuildInputs = [ core_kernel lru_cache ]; + }; + + indentation_buffer = janePackage { + pname = "indentation_buffer"; + hash = "sha256-5ayWs7yUnuxh5S3Dp0GbYTkGXttDMomfZak4MHePFbk="; + meta.description = "A library for building strings with indentation"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + int_repr = janePackage { + pname = "int_repr"; + hash = "sha256-lghu2U1JwZaR4dkd9PcJEW3pZSPoaFhUluIDwFAYFK0="; + meta.description = "Integers of various widths"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + janestreet_cpuid = janePackage { + pname = "janestreet_cpuid"; + hash = "sha256-lN8+8uhcVn3AoApWzqeCe/It1G6f0VgZzFcwFEckejk="; + meta.description = "A library for parsing CPU capabilities out of the `cpuid` instruction"; + propagatedBuildInputs = [ core core_kernel ppx_jane ]; + }; + + janestreet_csv = janePackage { + pname = "janestreet_csv"; + hash = "sha256-XLyHxVlgBvMIBrG2wzOudbKqy+N12Boheb3K+6o9y1o="; + propagatedBuildInputs = [ async bignum core_kernel core_unix csvfields delimited_parsing fieldslib numeric_string ppx_jane re2 textutils tyxml ocaml_pcre ]; + meta.description = "Tools for working with CSVs on the command line"; + }; + + jane_rope = janePackage { + pname = "jane_rope"; + hash = "sha256-MpjbwV+VS3qRuW8kxhjGzsITEdrPeWyr0V+LiKR6U8U="; + meta.description = "String representation with cheap concatenation"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "sha256-vS6tPg8LJolte/zI5KHFYCtNuZjn//cmd94Wls3bLCU="; + meta.description = "Jane Street C header files"; + }; + + js_of_ocaml_patches = janePackage { + pname = "js_of_ocaml_patches"; + hash = "sha256-Uj+X/0XUP5Za8NKfHGo9OZnqzKCiuurYJyluD6b0wOQ="; + meta.description = "Additions to js_of_ocaml's standard library that are required by Jane Street libraries"; + propagatedBuildInputs = [ js_of_ocaml js_of_ocaml-ppx ]; + }; + + jsonaf = janePackage { + pname = "jsonaf"; + hash = "sha256-Gn54NUg4YOyrXY5kXCZhHFz24CfUT9c55cJ2sOsNVw8="; + meta.description = "A library for parsing, manipulating, and serializing data structured as JSON"; + propagatedBuildInputs = [ base ppx_jane angstrom faraday ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "sha256-GviY+zYza7UNYOlAnfAz0aH4LH2B5xA+7iELLuZLgQQ="; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ dune-configurator ppx_assert stdio ]; + }; + + lru_cache = janePackage { + pname = "lru_cache"; + hash = "sha256-FqOBC4kBL9IuFIL4JrVU7iF1AUu+1R/CchR52eyEsa8="; + meta.description = "An LRU Cache implementation"; + propagatedBuildInputs = [ core_kernel ppx_jane ]; + }; + + man_in_the_middle_debugger = janePackage { + pname = "man_in_the_middle_debugger"; + hash = "sha256-b2A/ITf9gx3thSdEY2n7jxKrMOVDpzx4JkSMB3aTyE4="; + meta.description = "Man-in-the-middle debugging library"; + propagatedBuildInputs = [ async core ppx_jane angstrom angstrom-async ]; + }; + + n_ary = janePackage { + pname = "n_ary"; + hash = "sha256-ofstQs5R25NTP4EtBIzDE/Mzg9ZzAJKfAF838uu0zuE="; + meta.description = "A library for N-ary datatypes and operations"; + propagatedBuildInputs = [ base expect_test_helpers_core ppx_compare ppx_enumerate ppx_hash ppx_jane ppx_sexp_conv ppx_sexp_message ]; + }; + + numeric_string = janePackage { + pname = "numeric_string"; + hash = "sha256-MzRPXMR4Pi07mfJQgOV6R1Z22y2tvQTCq22+00aY1ik="; + meta.description = "A comparison function for strings that sorts numeric fragments of strings according to their numeric value"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + version = "0.12.4"; + hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; + minimalOCamlVersion = "4.04.1"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + ocaml-embed-file = janePackage { + pname = "ocaml-embed-file"; + hash = "sha256-rs+68VATumUgZQ9QrG+By5yNc8cy7avL0BDeqwix0co="; + propagatedBuildInputs = [ async ppx_jane ]; + meta.description = "Files contents as module constants"; + }; + + ocaml_intrinsics = janePackage { + pname = "ocaml_intrinsics"; + hash = "sha256-fbFXTakzxQEeCONSXRXh8FX3HD6h49LZHVsH62Zu3PA="; + meta.description = "Intrinsics"; + buildInputs = [ dune-configurator ]; + doCheck = false; # test rules broken + }; + + of_json = janePackage { + pname = "of_json"; + hash = "sha256-qh9mX03Fk9Jb8yox7mZ/CGbWecszK15oaygKbJVDqa0="; + meta.description = "A friendly applicative interface for Jsonaf"; + buildInputs = [ core core_extended jsonaf ppx_jane ]; + }; + + ordinal_abbreviation = janePackage { + pname = "ordinal_abbreviation"; + hash = "sha256-bGlzFcM6Yw8fcuovrv11WNtAB4mVYv4BjuMlkhsHomQ="; + meta.description = "A minimal library for generating ordinal names of integers"; + buildInputs = [ base ppx_jane ]; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "sha256-oc2ASDtUyRBB68tjAoblryAcXF+u3XP1mkQPO5hNbKo="; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + patdiff = janePackage { + pname = "patdiff"; + hash = "sha256-iVRYKgVBBJws3ZlUwnZt52bIydMtzV7a2R5mjksQAps="; + + # Used by patdiff-git-wrapper. Providing it here also causes the shebang + # line to be automatically patched. + buildInputs = [ bash ]; + propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; + meta = { + description = "File Diff using the Patience Diff algorithm"; + }; + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "sha256-JZd99bwLUNhFHng55d77yXSw9u50ahugepesXVdUl04="; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + polling_state_rpc = janePackage { + pname = "polling_state_rpc"; + hash = "sha256-l7SMFI+U2rde2OSUNOXPb9NBsvjPrBcxStNooxMgVB8="; + meta.description = "An RPC which tracks state on the client and server so it only needs to send diffs across the wire"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel core core_kernel diffable ppx_jane ]; + }; + + posixat = janePackage { + pname = "posixat"; + hash = "sha256-Nhp5jiK/TTwQXY5Bm4TTeH+xDTdXtvkSq5CS/Sr1UgA="; + propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + ppx_accessor = janePackage { + pname = "ppx_accessor"; + hash = "sha256-o70q8eSbPeuGkIcCnKoK0BpaqPhy/NS7x2YYR6wfki8="; + meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; + propagatedBuildInputs = [ accessor ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "sha256-LrpKE0BlFC3QseSXf5WhI71blshUzhH8yo2nXjAtiB8="; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "sha256-Ak+7+33qEGYwZWbES032SdkFOsae0+tWtR/DV+xrB10="; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_globalize ppx_hash ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "sha256-NZlzEMruf89NsI4jfQJLSPhjk/PN47hLbJzGEN8GPl8="; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "sha256-ktfa4umCnLd9oY2WWX/5R7vPB/g7DJX8x3nF9fYLNCQ="; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + doCheck = false; # circular dependency with ppx_jane + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "sha256-boP07qHPbzf4ntLdV18oyID09ZUOfkIn9ZdQ0DvtrUA="; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "sha256-4bZdhyfnzTjH4E303O6GO2jW968ftuXwoE4/x854JOo="; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib base ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "sha256-V30ijRgcma/rwysPxNAFnuJIb7XFrfi7mfjJxN+rSak="; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + ppx_css = janePackage { + pname = "ppx_css"; + hash = "sha256-spT/dJW8YJtG4pOku9r6VVlBAMwGakTrr1euiABeqsU="; + meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within"; + propagatedBuildInputs = [ async async_unix core_kernel core_unix ppxlib js_of_ocaml js_of_ocaml-ppx sedlex virtual_dom ]; + }; + + ppx_demo = janePackage { + pname = "ppx_demo"; + hash = "sha256-t/jz94YpwmorhWlcuflIZe0l85cESE62L9I7NMASVWM="; + meta.description = "PPX that exposes the source code string of an expression/module structure"; + propagatedBuildInputs = [ core dedent ppx_jane ppxlib ]; + }; + + ppx_derive_at_runtime = janePackage { + pname = "ppx_derive_at_runtime"; + hash = "sha256-UESWOkyWTHJlsE6KZkty9P+iHI3oY1rLve3raRAqMbk="; + meta.description = "Define a new ppx deriver by naming a runtime module"; + propagatedBuildInputs = [ base expect_test_helpers_core ppx_jane ppxlib ]; + }; + + ppx_disable_unused_warnings = janePackage { + pname = "ppx_disable_unused_warnings"; + hash = "sha256-jVNXmAy/Ti7MZmbdBjFuDwbmIILJB57flmmB6MoyCtY="; + meta.description = "Expands [@disable_unused_warnings] into [@warning \"-20-26-32-33-34-35-36-37-38-39-60-66-67\"]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "sha256-v5JPu+qEXoZ1+mu/yTZW2sfCzU0K60/sInG/Ox1D35s="; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "sha256-H5ybRHufycdyCxKu370+QZAMUPQsHVD+6nD93tzvLn8="; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_here ppx_inline_test re ]; + doCheck = false; # test build rules broken + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "sha256-kl0JZocMWo2KNciCWkT4nIbJZbh56ijZmlZWbxV8Qj0="; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + ppx_fixed_literal = janePackage { + pname = "ppx_fixed_literal"; + hash = "sha256-vS2KcCO0fVCmiIBkUBgK6qnqdjREj57QCujHERcJTyo="; + meta.description = "Simpler notation for fixed point literals"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_globalize = janePackage { + pname = "ppx_globalize"; + hash = "sha256-SG7710YPwWmhRVl7wN3ZQz3ZMTw3cpoywVSeVQAI3Zc="; + meta.description = "A ppx rewriter that generates functions to copy local values to the global heap"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "sha256-ZmdW+q7fak8iG42jRQgZ6chmjHHwrDSy9wg7pq/6zwk="; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "sha256-ULEom0pTusxf2k2hduv+5NVp7pW5doA/e3QGQNJfGoM="; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + doCheck = false; # test build rules broken + }; + + ppx_ignore_instrumentation = janePackage { + pname = "ppx_ignore_instrumentation"; + hash = "sha256-rAdxCgAKz0jNR8ppRJO4oAEvgXbcU4J4mpreAyeGe6k="; + meta.description = "Ignore Jane Street specific instrumentation extensions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "sha256-Ql0/80KitKvW3xffeCapYREmZvlg+QWCb2JM2T4Rjlc="; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib time_now ]; + doCheck = false; # test build rules broken + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "sha256-v+/wdEGaXdMWDBa0eJO0uR18G/pDwHjsjaskoEuLusA="; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_disable_unused_warnings ppx_expect ppx_fixed_literal ppx_ignore_instrumentation ppx_log ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_tydi ppx_typerep_conv ppx_variants_conv ]; + }; + + ppx_jsonaf_conv = janePackage { + pname = "ppx_jsonaf_conv"; + hash = "sha256-GWDhSLtr2+VG3XFIbHgWUcLJFniC7/z90ndiE919CBo="; + meta.description = + "[@@deriving] plugin to generate Jsonaf conversion functions"; + propagatedBuildInputs = [ base jsonaf ppx_jane ppxlib ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "sha256-q5CLyeu+5qjegLrJkQVMnId3HMvZ8j3c0PqEa2vTBtU="; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "sha256-/kEkYXFZ5OyTM4i/WWViaxKvigpoKKoiWtUWuEMkgBE="; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ppx_here ]; + }; + + ppx_log = janePackage { + pname = "ppx_log"; + hash = "sha256-/HwoxBWKuVqTDYe4u0cYNGqg2Lj0h49U2VrFa4cpE2g="; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ base ppx_here ppx_sexp_conv ppx_sexp_message sexplib ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "sha256-AfG+ZnacrR6p7MOvtktVKVLrMBpNMkX9b2+eqNZNRF4="; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "sha256-TONxBQq/b0kc89f3+jItHd9SnerNx8xa2AjO7HOW+xQ="; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "sha256-1GpKEEH1Ul+W0k4/8Mra/qYlyFpeMfZ3xrmB3X7uve0="; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pattern_bind = janePackage { + pname = "ppx_pattern_bind"; + hash = "sha256-ShR8N71a7sz5XaKDyybsy+K0Uu7sYMgvpMADVxmrI/g="; + meta.description = "A ppx for writing fast incremental bind nodes in a pattern match"; + propagatedBuildInputs = [ ppx_let ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "sha256-gSS+vfsYw3FFOFZ8/iRnP3rxokKAU7EPa1wXq7SbJBk="; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_python = janePackage { + pname = "ppx_python"; + hash = "sha256-lpc6F+Scc5ECdOXPWowKSWRnFSzKbmE8oHs7zCjq3j8="; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + propagatedBuildInputs = [ ppx_base ppxlib pyml ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + hash = "sha256-eCQfYAxZZmfNTbPrFW0sqrj63kIdIQ1MAlImCaMop68="; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib sexplib0 base ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "sha256-4g3Fjrjqhw+XNkCyxrXkgZDEa3e+ytPsEtQA2xSv+jA="; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "sha256-LsP+deeFYxB38xXw7LLB3gOMGZiUOFRYklGVY7DMmvE="; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "sha256-DFCBJY+Q8LjXSF9vHwPpUJLNyMoAXdDwQZrvhl+9g0U="; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_stable_witness = janePackage { + pname = "ppx_stable_witness"; + hash = "sha256-W1CN4xspM8NJiXfi7OsngfzWnLEUmBs+IRLwHfxX9d4="; + meta.description = "Ppx extension for deriving a witness that a type is intended to be stable"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_string = janePackage { + pname = "ppx_string"; + hash = "sha256-GQlgiaES8wc6Y7rTgmPrf9UfMfu125VoNGEbdc7kFsk="; + meta.description = "Ppx extension for string interpolation"; + propagatedBuildInputs = [ ppx_base ppxlib stdio ]; + }; + + ppx_tydi = janePackage { + pname = "ppx_tydi"; + hash = "sha256-neu2Z7TgQdBzf8UtYDRhnGp3Iggfd90Fr+gQuwVTMOo="; + meta.description = "Let expressions, inferring pattern type from expression"; + propagatedBuildInputs = [ base ppxlib ]; + }; + + ppx_typed_fields = janePackage { + pname = "ppx_typed_fields"; + hash = "sha256-l4lCQ4n5FLPS82sb3FgW+HF2OEY/kY10sNfr+aQF8x8="; + meta.description = "GADT-based field accessors and utilities"; + propagatedBuildInputs = [ core ppx_jane ppxlib ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + hash = "sha256-DxjgwZee0jOea7qyPfEhRrdcKWQb2jtjrowiJszS+Fs="; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + hash = "sha256-Q/CCcMrD+XN5YRMzKvXuiQHfcwXwI773s8x150/eMzs="; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + pythonlib = janePackage { + pname = "pythonlib"; + version = "0.16"; + hash = "sha256-HrsdtwPSDSaMB9CDIR9P5iaAmLihUrReuNAPIYa+s3Y="; + meta.description = "A library to help writing wrappers around ocaml code for python"; + propagatedBuildInputs = [ base core expect_test_helpers_core ppx_compare ppx_expect ppx_here ppx_let ppx_python ppx_string stdio typerep pyml ]; + meta.broken = lib.versionAtLeast ocaml.version "4.14"; + }; + + profunctor = janePackage { + pname = "profunctor"; + hash = "sha256-CFHMtCuBnrlr+B2cdJm2Tamt0A/e+f3SnjEavvE31xQ="; + meta.description = "A library providing a signature for simple profunctors and traversal of a record"; + propagatedBuildInputs = [ base ppx_jane record_builder ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "sha256-GVjnwne6ksjY9ptLOpbsgG0La6eiCJf1w4teYEtgJrA="; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "sha256-ZRJ7ooXtatEEh0sPL8M9OZ+6s7xNdTuw0Ot6txiG16I="; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel jane_rope regex_parser_intf ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + re2_stable = janePackage { + pname = "re2_stable"; + version = "0.14.0"; + hash = "sha256-gyet2Pzn7ZIqQ+UP2J51pRmwaESY2LSGTqCMZZwDTE4="; + meta.description = "Re2_stable adds an incomplete but stable serialization of Re2"; + propagatedBuildInputs = [ core re2 ]; + }; + + record_builder = janePackage { + pname = "record_builder"; + hash = "sha256-46zGgN9RlDjoSbi8RimuQVrMhy65Gpic0YPZpHOeoo0="; + meta.description = "A library which provides traversal of records with an applicative"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + redis-async = janePackage { + pname = "redis-async"; + hash = "sha256-5msIS2m8nkaprR8NEBfKFWZBWaDJiUtjHbfPelg9/os="; + meta.description = "Redis client for Async applications"; + propagatedBuildInputs = [ async bignum core core_kernel ppx_jane ]; + }; + + regex_parser_intf = janePackage { + pname = "regex_parser_intf"; + hash = "sha256-huzHtUIIVRd5pE7VU1oUjN20S55L6+WCvoLlQ0FCD7A="; + meta.description = "Interface shared by Re_parser and Re2.Parser"; + propagatedBuildInputs = [ base ]; + }; + + resource_cache = janePackage { + pname = "resource_cache"; + hash = "sha256-dN4skSHswgRYLZqN/tqhFFTfgoN8H/LgTgoe+5ZI5zE="; + meta.description = "General resource cache"; + propagatedBuildInputs = [ async_rpc_kernel ]; + }; + + semantic_version = janePackage { + pname = "semantic_version"; + hash = "sha256-KJanaDUW56ndvnTlnPeQgh0C7zsRqXJ328gcEiVDrmc="; + meta.description = "Semantic versioning"; + propagatedBuildInputs = [ core ppx_jane re ]; + }; + + sexp = janePackage { + pname = "sexp"; + hash = "sha256-JWRYi5lX9UOKg+RGvW6FO61t2HlnJKXhzctOHXe0bCM="; + propagatedBuildInputs = [ + async + core + csvfields + jsonaf + re2 + sexp_diff + sexp_macro + sexp_pretty + sexp_select + shell + ]; + meta.description = "S-expression swiss knife"; + }; + + sexp_grammar = janePackage { + pname = "sexp_grammar"; + hash = "sha256-Y/abRingL4+3qvaKgW9jH46E9uq7jYE2+kgr8ERKqfI="; + propagatedBuildInputs = [ core ppx_bin_prot ppx_compare ppx_hash ppx_let ppx_sexp_conv ppx_sexp_message zarith ]; + meta.description = "Helpers for manipulating [Sexplib.Sexp_grammar] values"; + }; + + sexp_diff = janePackage { + pname = "sexp_diff"; + hash = "sha256-2dMBKf7eUbKZtvV7Ol2mPMzYJOCDHuOm9xFZ8vkmp/0="; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Code for computing the diff of two sexps"; + }; + + sexp_macro = janePackage { + pname = "sexp_macro"; + hash = "sha256-x9WsFFrV7wUqgPUw8KkfyzOxLrS5h5++OSK8QljeQqg="; + propagatedBuildInputs = [ async sexplib ]; + meta.description = "Sexp macros"; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "sha256-tcWdYZ717LkGowRSRoEcUNY7VCMX64uhCaY3bXhWxKM="; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ ppx_base re sexplib ]; + }; + + sexp_select = janePackage { + pname = "sexp_select"; + hash = "sha256-HEzZowojeK9yDOoTY/l01fYLUdolzQGlMO9u3phV8so="; + propagatedBuildInputs = [ base ppx_jane ]; + meta.description = "A library to use CSS-style selectors to traverse sexp trees"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "sha256-wRr1M243Bqu/XLSsr5IVPH5RTVWeVgZjxkKOrm+PW5E="; + minimalOCamlVersion = "4.08.0"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "sha256-6MwggpjHo4FmKF88fP56LN9OHi2uIJc13TvKx4T7gEI="; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + shell = janePackage { + pname = "shell"; + hash = "sha256-pK434+ToeYURQHRV+gK57rC7BFvznWEvIu5NAib2ZTU="; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ textutils ]; + checkInputs = [ ounit ]; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "sha256-npIcrxMOcIgsecdUEx5XHYp0KVrXiMzMLi8jskAp4vo="; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + + spawn = janePackage { + pname = "spawn"; + minimalOCamlVersion = "4.02.3"; + version = "0.15.0"; + hash = "1fjr91psas5zmk1hxvxh0dchhn0pkyzlr4gg232f5g9vdgissi0p"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + splay_tree = janePackage { + pname = "splay_tree"; + hash = "sha256-Ag6yqTofEZ3v0qF+Z7xpXQOh7+HWtvRLlY+iAYqcReg="; + meta.description = "A splay tree implementation"; + propagatedBuildInputs = [ core_kernel ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "sha256-wMmLuzhKmnS2iTYVTPUx5Rv2LhL/ygmWmb9t2pUjz+E="; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "sha256-+QgxqSMqO4VGoMWWJ3QoXdtJKcVpxlSQ/OI7dmcNqjw="; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + stored_reversed = janePackage { + pname = "stored_reversed"; + hash = "sha256-ef11f0qifEvxKChM49Hnfk6J6hL+b0tMlm0iDLd5Y0Q="; + meta.description = "A library for representing a list temporarily stored in reverse order"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + streamable = janePackage { + pname = "streamable"; + hash = "sha256-3djrUW2tPKaEmoOIpdjN6ok7U9i07yreqbi1kP+6pnY="; + meta.description = "A collection of types suitable for incremental serialization"; + propagatedBuildInputs = [ async_kernel async_rpc_kernel base core core_kernel ppx_jane ppxlib ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "sha256-2qy99MUMpkuNCvCYlk36k4kN6cPjrEILbwEUv4DyNYw="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core_unix textutils_kernel ]; + }; + + textutils_kernel = janePackage { + pname = "textutils_kernel"; + hash = "sha256-DiXemANj5ONmvMzp+tly3AJud5u9i7HdaHmn8aVQS48="; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ppx_jane uutf ]; + }; + + tilde_f = janePackage { + pname = "tilde_f"; + hash = "sha256-qLjM9liJfMIh2fqRPBdnmtUf4xhzk2MY8dFNdON3Aew="; + meta.description = "Provides a let-syntax for continuation-passing style"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "sha256-DjSrx/HgwCYS0Xzm2gFvWUVLD7a1KuFVIyVrJjBi8Tc="; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + timezone = janePackage { + pname = "timezone"; + hash = "sha256-pmXUMvLfgAwP6TV/aP9wMlOs0KfwEWtaJfdjUFLbOu0="; + meta.description = "Time-zone handling"; + propagatedBuildInputs = [ core_kernel ]; + }; + + topological_sort = janePackage { + pname = "topological_sort"; + hash = "sha256-um5++60mR++iHAruKqoQfd4EbQ1kb3L+cPOWhs9sIHI="; + meta.description = "Topological sort algorithm"; + propagatedBuildInputs = [ ppx_jane stdio ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "sha256-iJnIjWZYCTaH29x7nFviCrbnTmHRChZkkj6E5sgi4mU="; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "sha256-8NoNkyIP7iEEiei+Q1zrPoJjnWwhCsLsY1vgua22gnw="; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + vcaml = janePackage { + pname = "vcaml"; + hash = "sha256-pmEKi24+22T76SzI3RpBmQF7ZrQwlngrpFYLoBdLwe0="; + meta.description = "OCaml bindings for the Neovim API"; + propagatedBuildInputs = [ angstrom-async async_extra expect_test_helpers_async faraday jsonaf man_in_the_middle_debugger semantic_version ]; + }; + + virtual_dom = janePackage { + pname = "virtual_dom"; + hash = "sha256-nXW9cDHQVugriR0+GkayuV4S3HKothQAoNJef02iALM="; + meta.description = "OCaml bindings for the virtual-dom library"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ base64 core_kernel gen_js_api js_of_ocaml js_of_ocaml_patches lambdasoup tyxml uri ]; + }; + + zarith_stubs_js = janePackage { + pname = "zarith_stubs_js"; + hash = "sha256-oKD+JE08Mgvk5l8XFHSZ7xqiWPaOvKC87+zHLaQ/7q0="; + meta.description = "Javascripts stubs for the Zarith library"; + }; + + zstandard = janePackage { + pname = "zstandard"; + hash = "sha256-QcYqlOpCAr0owmO6sLDJhki8lUnNvtkaxldKb5I5AF0="; + meta.description = "OCaml bindings to Zstandard"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ core_kernel ctypes zstd ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix new file mode 100644 index 000000000000..061fed447466 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.16" }: + +{ pname +, version ? defaultVersion +, hash +, minimalOCamlVersion ? "4.14" +, doCheck ? true +, buildInputs ? [] +, ...}@args: + +buildDunePackage (args // { + duneVersion = "3"; + inherit version buildInputs; + + inherit minimalOCamlVersion; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + inherit doCheck; + + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; +}) diff --git a/pkgs/development/ocaml-modules/tls/async.nix b/pkgs/development/ocaml-modules/tls/async.nix index 002af344db9c..5e861592cd7b 100644 --- a/pkgs/development/ocaml-modules/tls/async.nix +++ b/pkgs/development/ocaml-modules/tls/async.nix @@ -5,8 +5,12 @@ buildDunePackage rec { inherit (tls) src meta version; - minimalOCamlVersion = "4.11"; - duneVersion = "3"; + minimalOCamlVersion = "4.13"; + + patches = [ + # Remove when TLS gets updated to v0.17.1. + ./janestreet-0.16.patch + ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch b/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch new file mode 100644 index 000000000000..7d36ad227fa0 --- /dev/null +++ b/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch @@ -0,0 +1,23 @@ +diff --git a/async/tls_async.mli b/async/tls_async.mli +index b4894b8..101f27f 100644 +--- a/async/tls_async.mli ++++ b/async/tls_async.mli +@@ -55,4 +55,4 @@ val connect + -> 'addr Tcp.Where_to_connect.t + -> host:[ `host ] Domain_name.t option + -> (Session.t * Reader.t * Writer.t) Deferred.Or_error.t) +- Tcp.with_connect_options ++ Tcp.Aliases.with_connect_options +diff --git a/async/x509_async.ml b/async/x509_async.ml +index d4fad8c..4ee466a 100644 +--- a/async/x509_async.ml ++++ b/async/x509_async.ml +@@ -9,7 +9,7 @@ let file_contents file = + let load_all_in_directory ~directory ~f = + let open Deferred.Or_error.Let_syntax in + let%bind files = Deferred.Or_error.try_with (fun () -> Sys.ls_dir directory) in +- Deferred.Or_error.List.map files ~f:(fun file -> ++ Deferred.Or_error.List.map ~how:`Sequential files ~f:(fun file -> + let%bind contents = file_contents (directory ^/ file) in + f ~contents) + ;; diff --git a/pkgs/development/tools/comby/comby.patch b/pkgs/development/tools/comby/comby.patch index d3d2088d602f..b780560093d4 100644 --- a/pkgs/development/tools/comby/comby.patch +++ b/pkgs/development/tools/comby/comby.patch @@ -1,5 +1,5 @@ diff --git a/comby-kernel.opam b/comby-kernel.opam -index 9db7cc5..a497bff 100644 +index 9db7cc5..83e6e7b 100644 --- a/comby-kernel.opam +++ b/comby-kernel.opam @@ -20,7 +20,7 @@ build: [ @@ -7,7 +7,7 @@ index 9db7cc5..a497bff 100644 "dune" {>= "2.8.0"} "ocaml" {>= "4.08.1"} - "core_kernel" -+ "core_kernel" {>= "v0.15.0"} ++ "core-kernel" {>= "v0.16.0"} "mparser" {>= "1.3"} "mparser-pcre" "ppx_deriving" @@ -25,7 +25,7 @@ index 88563f6..fbbc122 100644 "lwt" "cohttp" diff --git a/comby.opam b/comby.opam -index 9e5d96b..ecab789 100644 +index 9e5d96b..d5be316 100644 --- a/comby.opam +++ b/comby.opam @@ -31,7 +31,7 @@ depends: [ @@ -33,14 +33,23 @@ index 9e5d96b..ecab789 100644 "comby-kernel" {= "1.7.0"} "comby-semantic" {= "1.7.0"} - "core" -+ "core" {>= "v0.15.0"} ++ "core" {>= "v0.16.0"} "hack_parallel" {arch != "arm32" & arch != "arm64"} "lwt" "lwt_react" diff --git a/lib/app/configuration/command_configuration.ml b/lib/app/configuration/command_configuration.ml -index 75c3107..418276e 100644 +index 75c3107..29826a9 100644 --- a/lib/app/configuration/command_configuration.ml +++ b/lib/app/configuration/command_configuration.ml +@@ -1,7 +1,7 @@ + open Core + open Camlzip + +-open Polymorphic_compare ++open Poly + + open Comby_kernel + @@ -16,21 +16,21 @@ type 'a next = let fold_directory ?(sorted=false) root ~init ~f = @@ -356,6 +365,60 @@ index 7a6353d..b79cba2 100644 - (preprocess (pps ppx_jane))) + (preprocess + (pps ppx_jane))) +diff --git a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml +index 4e064fb..dca77b2 100644 +--- a/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml ++++ b/lib/app/vendored/patdiff/kernel/src/float_tolerance.ml +@@ -287,7 +287,7 @@ end = struct + ~running_step:(fun (car, pos) cadr -> + match car, cadr with + | Same car_lines, Same cadr_lines -> +- Skip (Same (Array.concat [ car_lines; cadr_lines ]), pos) ++ Skip {state = (Same (Array.concat [ car_lines; cadr_lines ]), pos)} + | Unified _, _ | _, Unified _ -> + raise_s + [%message +@@ -296,7 +296,7 @@ end = struct + (cadr : string Range.t)] + | (Prev _ | Next _ | Replace _), (Prev _ | Next _ | Replace _) + | Same _, (Prev _ | Next _ | Replace _) +- | (Prev _ | Next _ | Replace _), Same _ -> Yield ((car, pos), (cadr, Middle))) ++ | (Prev _ | Next _ | Replace _), Same _ -> Yield {value = (car, pos); state = (cadr, Middle)}) + ~inner_finished:(fun (last, pos) -> + match last, pos with + | Unified _, _ -> +@@ -308,7 +308,7 @@ end = struct + Some (last, End)) + ~finishing_step:(function + | None -> Done +- | Some result -> Yield (result, None)) ++ | Some result -> Yield {value = result; state = None}) + ;; + + include struct +@@ -448,7 +448,7 @@ end = struct + ~init:{ prev_start; next_start; ranges = [] } + ~running_step:(fun t drop_or_keep -> + match (drop_or_keep : Drop_or_keep.t) with +- | Keep range -> Skip { t with ranges = range :: t.ranges } ++ | Keep range -> Skip {state = { t with ranges = range :: t.ranges }} + | Drop n -> + let hunk = to_hunk t in + let t = +@@ -457,11 +457,11 @@ end = struct + ; ranges = [] + } + in +- if List.is_empty (Hunk.ranges hunk) then Skip t else Yield (hunk, t)) ++ if List.is_empty (Hunk.ranges hunk) then Skip {state = t} else Yield {value = hunk; state = t}) + ~inner_finished:(fun t -> if List.is_empty t.ranges then None else Some t) + ~finishing_step:(function + | None -> Done +- | Some t -> Yield (to_hunk t, None)) ++ | Some t -> Yield {value = to_hunk t; state = None}) + ;; + end + diff --git a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml b/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml index 4f53a0b..88ee0e3 100644 --- a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml @@ -501,7 +564,7 @@ index 03b120a..4d48b61 100644 + ppx_deriving_yojson + ppx_deriving_yojson.runtime)) diff --git a/lib/kernel/matchers/alpha.ml b/lib/kernel/matchers/alpha.ml -index d6116f7..993aafc 100644 +index d6116f7..7d16171 100644 --- a/lib/kernel/matchers/alpha.ml +++ b/lib/kernel/matchers/alpha.ml @@ -13,20 +13,11 @@ module R = MakeRegexp(Regexp) @@ -537,6 +600,15 @@ index d6116f7..993aafc 100644 List.fold plist ~init:(return Types.Unit) ~f:(>>) let with_debug_matcher s tag = +@@ -745,7 +736,7 @@ module Make (Lang : Types.Language.S) (Meta : Types.Metasyntax.S) (Ext : Types.E + let hole_parser ?at_depth sort dimension = + let open Types.Hole in + let hole_parser = +- let open Polymorphic_compare in ++ let open Poly in + List.fold ~init:[] hole_parsers ~f:(fun acc (sort', parser) -> if sort' = sort then parser::acc else acc) + in + let skip_signal hole = skip (string "_signal_hole") |>> fun () -> Types.Hole hole in diff --git a/lib/kernel/matchers/dune b/lib/kernel/matchers/dune index 12ed326..4625458 100644 --- a/lib/kernel/matchers/dune @@ -566,7 +638,7 @@ index 12ed326..4625458 100644 + yojson + ppx_deriving_yojson)) diff --git a/lib/kernel/matchers/evaluate.ml b/lib/kernel/matchers/evaluate.ml -index 9ea71a0..288f79a 100644 +index 9ea71a0..4f63ab6 100644 --- a/lib/kernel/matchers/evaluate.ml +++ b/lib/kernel/matchers/evaluate.ml @@ -3,10 +3,7 @@ open Core_kernel @@ -581,8 +653,17 @@ index 9ea71a0..288f79a 100644 type result = bool * Match.environment option +@@ -102,7 +99,7 @@ let apply + |> Option.some + in + List.find_map cases ~f:(fun (template, case_expression) -> evaluate template case_expression) +- |> Option.value_map ~f:ident ~default:(false, Some env) ++ |> Option.value_map ~f:Fn.id ~default:(false, Some env) + + (* rewrite ... { ... } *) + | Rewrite (Template t, (match_template, rewrite_template)) -> diff --git a/lib/kernel/matchers/omega.ml b/lib/kernel/matchers/omega.ml -index 61cc69a..0bef682 100644 +index 61cc69a..3445307 100644 --- a/lib/kernel/matchers/omega.ml +++ b/lib/kernel/matchers/omega.ml @@ -32,15 +32,9 @@ let push_source_ref : string ref = ref "" @@ -593,17 +674,25 @@ index 61cc69a..0bef682 100644 - match Sys.getenv "DEBUG_COMBY" with - | exception Not_found -> false - | _ -> true -- ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + -let rewrite = - match Sys.getenv "REWRITE" with - | exception Not_found -> false - | _ -> true -+let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some -+ +let rewrite = Sys.getenv "REWRITE" |> Option.is_some let actual = Buffer.create 10 +@@ -540,7 +534,7 @@ module Make (Language : Types.Language.S) (Meta : Metasyntax.S) (Ext : External. + + let hole_parser sort dimension : (production * 'a) t t = + let hole_parser = (* This must be fold, can't be find *) +- let open Polymorphic_compare in ++ let open Poly in + List.fold ~init:[] Template.Matching.hole_parsers ~f:(fun acc (sort', parser) -> + if sort' = sort then parser::acc else acc) + in diff --git a/lib/kernel/matchers/preprocess.ml b/lib/kernel/matchers/preprocess.ml index 84f3ed0..b6d10e7 100644 --- a/lib/kernel/matchers/preprocess.ml @@ -633,7 +722,7 @@ index ef0bd59..906820b 100644 module type Regexp_engine_intf = sig type t diff --git a/lib/kernel/matchers/rewrite.ml b/lib/kernel/matchers/rewrite.ml -index 32c4740..2fc28db 100644 +index 32c4740..545cba5 100644 --- a/lib/kernel/matchers/rewrite.ml +++ b/lib/kernel/matchers/rewrite.ml @@ -4,10 +4,7 @@ open Core_kernel @@ -648,6 +737,35 @@ index 32c4740..2fc28db 100644 let counter = let uuid_for_id_counter = ref 0 in +@@ -46,24 +43,24 @@ let parse_first_label ?(metasyntax = Metasyntax.default_metasyntax) template = + in + parse_string ~consume:All parser template + |> function +- | Ok label -> List.find_map label ~f:ident ++ | Ok label -> List.find_map label ~f:Fn.id + | Error _ -> None + + let substitute_fresh + ?(metasyntax = Metasyntax.default_metasyntax) + ?(fresh = counter) + template = +- let label_table = String.Table.create () in ++ let label_table = Hashtbl.create (module String) in + let template_ref = ref template in + let current_label_ref = ref (parse_first_label ~metasyntax !template_ref) in + while Option.is_some !current_label_ref do + let label = Option.value_exn !current_label_ref in + let id = +- match String.Table.find label_table label with ++ match Hashtbl.find label_table label with + | Some id -> id + | None -> + let id = fresh () in +- if String.(label <> "") then String.Table.add_exn label_table ~key:label ~data:id; ++ if String.(label <> "") then Hashtbl.add_exn label_table ~key:label ~data:id; + id + in + let left, right = replacement_sentinel metasyntax in diff --git a/lib/kernel/matchers/template.ml b/lib/kernel/matchers/template.ml index 423a07f..136236c 100644 --- a/lib/kernel/matchers/template.ml diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af37e4eb4fee..3349c0fb23c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9829,6 +9829,7 @@ with pkgs; ligo = callPackage ../development/compilers/ligo { coq = coq_8_14; + ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; }; lego = callPackage ../tools/admin/lego { }; @@ -17457,7 +17458,9 @@ with pkgs; stalin = callPackage ../development/compilers/stalin { }; - stanc = callPackage ../development/compilers/stanc { }; + stanc = callPackage ../development/compilers/stanc { + ocamlPackages = ocaml-ng.ocamlPackages_4_14_janeStreet_0_15; + }; metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4b9ce4d1b9eb..216d490972b0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -60,9 +60,7 @@ let ### B ### - bap = callPackage ../development/ocaml-modules/bap { - inherit (pkgs.llvmPackages) llvm; - }; + bap = janeStreet_0_15.bap; base64 = callPackage ../development/ocaml-modules/base64 { }; @@ -86,7 +84,7 @@ let biniou = callPackage ../development/ocaml-modules/biniou { }; - biocaml = callPackage ../development/ocaml-modules/biocaml { }; + biocaml = janeStreet_0_15.biocaml; bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; @@ -718,7 +716,9 @@ let # Jane Street janePackage = - if lib.versionOlder "4.10.2" ocaml.version + if lib.versionOlder "4.13.1" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_16.nix {} + else if lib.versionOlder "4.10.2" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {} else if lib.versionOlder "4.08" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} @@ -727,7 +727,12 @@ let else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = - if lib.versionOlder "4.10.2" ocaml.version + if lib.versionOlder "4.13.1" ocaml.version + then import ../development/ocaml-modules/janestreet/0.16.nix { + inherit self; + inherit (pkgs) bash fetchpatch fzf lib openssl zstd; + } + else if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { inherit self; inherit (pkgs) bash fetchpatch fzf lib openssl zstd; @@ -751,6 +756,75 @@ let inherit (pkgs) openssl; }; + janeStreet_0_15 = (lib.makeScope self.newScope (self': with self'; { + + # ocamlPackages that janestreet v0.15 packages depend on. + jsDeps = let + uri-sexp = self.uri-sexp.override { inherit (self') ppx_sexp_conv sexplib0; }; + cohttp = self.cohttp.override { + inherit (self') ppx_sexp_conv; + inherit uri-sexp; + }; + ipaddr-sexp = self.ipaddr-sexp.override { inherit (self') ppx_sexp_conv; }; + conduit = self.conduit.override { + inherit (self') ppx_sexp_conv sexplib; + inherit ipaddr-sexp; + }; + conduit-async = self.conduit-async.override { + inherit (self') async ppx_sexp_conv ppx_here core sexplib async_ssl; + inherit conduit ipaddr-sexp; + }; + in { + inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes; + ppxlib = self.ppxlib.override { inherit (self') stdio; }; + cohttp-async = self.cohttp-async.override { + inherit (self') ppx_sexp_conv base async async_kernel async_unix core_unix sexplib0 core; + inherit uri-sexp cohttp conduit-async; + }; + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix { }; + }; + + janeStreet = import ../development/ocaml-modules/janestreet/0.15.nix { + self = self' // jsDeps; + inherit (pkgs) bash fetchpatch fzf lib openssl zstd; + }; + + # Packages that are not part of janestreet libraries, but still depend + # on v0.15 are kept in this scope, too. + + bap = let + ppxlib = jsDeps.ppxlib; + lwt_ppx = self.lwt_ppx.override { inherit ppxlib; }; + sedlex = self.sedlex.override { inherit ppxlib ppx_expect; }; + in callPackage ../development/ocaml-modules/bap { + inherit (pkgs.llvmPackages) llvm; + ezjsonm = self.ezjsonm.override { inherit sexplib0; }; + ppx_bitstring = self.ppx_bitstring.override { inherit ppxlib; }; + ocurl = self.ocurl.override { inherit lwt_ppx; }; + piqi = self.piqi.override { inherit sedlex; }; + piqi-ocaml = self.piqi-ocaml.override { inherit piqi; }; + }; + + biocaml = let + angstrom = self.angstrom.override { inherit ppx_let; }; + in callPackage ../development/ocaml-modules/biocaml { + uri = self.uri.override { inherit angstrom; }; + cfstream = self.cfstream.override { inherit core_kernel; }; + }; + + magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; + + phylogenetics = let + angstrom = self.angstrom.override { inherit ppx_let; }; + in callPackage ../development/ocaml-modules/phylogenetics { + inherit biocaml; + ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; + angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; + }; + + ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; + })).overrideScope' liftJaneStreet; + janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { self = self.janeStreet_0_9_0; super = self // { @@ -930,7 +1004,7 @@ let magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; - magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; + magic-trace = janeStreet_0_15.magic-trace; mariadb = callPackage ../development/ocaml-modules/mariadb { inherit (pkgs) mariadb; @@ -1332,7 +1406,7 @@ let pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; - phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; + phylogenetics = janeStreet_0_15.phylogenetics; piaf = callPackage ../development/ocaml-modules/piaf { }; @@ -1366,7 +1440,7 @@ let pprint = callPackage ../development/ocaml-modules/pprint { }; - ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; + ppx_bap = janeStreet_0_15.ppx_bap; ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; @@ -1857,6 +1931,13 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages = ocamlPackages_4_14; + # This is a nasty way to replace toplevel janestreet attributes in the scope, + # so that modules outside of ocamlPackages that depend on JS OCaml libraries + # *and* non-JS OCaml libraries can pull in the same version of JS transitive + # dependencies. Remove this once ligo and stanc can be compiled against + # janestreet 0.16 libraries. + ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope' (self: super: super // super.janeStreet_0_15); + # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. ocamlPackages_4_14_unsafe_string = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { From 658e71cd9f80ddb0e2db932142e301afaaae7bca Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 30 Aug 2023 10:27:43 +0300 Subject: [PATCH 133/221] balena-cli: 16.7.6 -> 17.0.0 Since upstream now supports nodejs18, we can use buildNpmPackage and build it completely from source. See also: https://github.com/balena-io/balena-cli/issues/2620 . Also, add doronbehar as maintainer. --- pkgs/tools/admin/balena-cli/default.nix | 106 +++++++----------------- 1 file changed, 30 insertions(+), 76 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 827d4e162b51..c687eb994d94 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -1,47 +1,43 @@ { lib , stdenv -, fetchzip +, buildNpmPackage +, fetchFromGitHub , testers +, balena-cli +, nodePackages +, python3 +, udev }: -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - plat = { - x86_64-linux = "linux-x64"; - x86_64-darwin = "macOS-x64"; - # Balena only packages for x86 so we rely on Rosetta for Apple Silicon - aarch64-darwin = "macOS-x64"; - }.${system} or throwSystem; - - sha256 = { - x86_64-linux = "sha256-USljQ/cnbSabzsZWXlZ0eeZSqkTr3wVP0ktXqZ7Fw4U="; - x86_64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY="; - aarch64-darwin = "sha256-NWzJPB+HzlsB6yTcEMwTg8pioonGWPOU96jyIpiZiTY="; - }.${system} or throwSystem; - - version = "16.7.6"; - src = fetchzip { - url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip"; - inherit sha256; - }; -in -stdenv.mkDerivation (finalAttrs: { +buildNpmPackage rec { pname = "balena-cli"; - inherit version src; + version = "17.0.0"; - installPhase = '' - runHook preInstall + src = fetchFromGitHub { + owner = "balena-io"; + repo = "balena-cli"; + rev = "v${version}"; + hash = "sha256-sNpxjSumiP+4fX6b3j+HEl/lr4pvudrhfTzr2TYastE="; + }; - mkdir -p $out/bin - cp -r ./* $out/ - ln -s $out/balena $out/bin/balena + npmDepsHash = "sha256-q2Yc6e5dEiP2Q4tFIeqj4mswM1/pX1pdGeoagyiupvs="; - runHook postInstall + postPatch = '' + ln -s npm-shrinkwrap.json package-lock.json ''; + makeCacheWritable = true; + + nativeBuildInputs = [ + nodePackages.node-gyp + python3 + ]; + + buildInputs = lib.optionals (!stdenv.isDarwin) [ + udev + ]; passthru.tests.version = testers.testVersion { - package = finalAttrs.finalPackage; + package = balena-cli; command = '' # Override default cache directory so Balena CLI's unavoidable update check does not fail due to write permissions BALENARC_DATA_DIRECTORY=./ balena --version @@ -49,46 +45,6 @@ stdenv.mkDerivation (finalAttrs: { inherit version; }; - # https://github.com/NixOS/nixpkgs/pull/48193/files#diff-b65952dbe5271c002fbc941b01c3586bf5050ad0e6aa6b2fcc74357680e103ea - preFixup = - if stdenv.isLinux then - let - libPath = lib.makeLibraryPath [ stdenv.cc.cc ]; - in - '' - orig_size=$(stat --printf=%s $out/balena) - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/balena - patchelf --set-rpath ${libPath} $out/balena - chmod +x $out/balena - new_size=$(stat --printf=%s $out/balena) - ###### zeit-pkg fixing starts here. - # we're replacing plaintext js code that looks like - # PAYLOAD_POSITION = '1234 ' | 0 - # [...] - # PRELUDE_POSITION = '1234 ' | 0 - # ^-----20-chars-----^^------22-chars------^ - # ^-- grep points here - # - # var_* are as described above - # shift_by seems to be safe so long as all patchelf adjustments occur - # before any locations pointed to by hardcoded offsets - var_skip=20 - var_select=22 - shift_by=$(expr $new_size - $orig_size) - function fix_offset { - # $1 = name of variable to adjust - location=$(grep -obUam1 "$1" $out/bin/balena | cut -d: -f1) - location=$(expr $location + $var_skip) - value=$(dd if=$out/balena iflag=count_bytes,skip_bytes skip=$location \ - bs=1 count=$var_select status=none) - value=$(expr $shift_by + $value) - echo -n $value | dd of=$out/balena bs=1 seek=$location conv=notrunc - } - fix_offset PAYLOAD_POSITION - fix_offset PRELUDE_POSITION - '' else ''''; - dontStrip = true; - meta = with lib; { description = "A command line interface for balenaCloud or openBalena"; longDescription = '' @@ -100,9 +56,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/balena-io/balena-cli"; changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ maintainers.kalebpace ]; - platforms = platforms.linux ++ platforms.darwin; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + maintainers = [ maintainers.kalebpace maintainers.doronbehar ]; mainProgram = "balena"; }; -}) +} From 3810cb56813c74cd526147d52aa004bfdd83dde7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 08:19:09 +0200 Subject: [PATCH 134/221] python311Packages.datasets: update disabled --- pkgs/development/python-modules/datasets/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 46e8275ff314..eae7b663dd99 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { version = "2.14.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; From 39d2a80fe3124268f580ea69c200a3cc706317f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 06:23:37 +0000 Subject: [PATCH 135/221] mockoon: 3.0.0 -> 4.1.0 --- pkgs/tools/networking/mockoon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/tools/networking/mockoon/default.nix index df151764501b..e98b4ac7df44 100644 --- a/pkgs/tools/networking/mockoon/default.nix +++ b/pkgs/tools/networking/mockoon/default.nix @@ -5,11 +5,11 @@ let pname = "mockoon"; - version = "3.0.0"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/mockoon/mockoon/releases/download/v${version}/mockoon-${version}.AppImage"; - hash = "sha256-YGcD/8h21fUoBEAcBVI5jo0UMCKdVRdC1zxDIrHjU+8="; + hash = "sha256-7wf7RFyYQN0pGcfKRzYOxs0qNi27JuX/nXUzT/zMSY4="; }; appimageContents = appimageTools.extractType2 { From 023ed237f5b2ddd29785329dea5c5010429eca13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 08:27:27 +0200 Subject: [PATCH 136/221] python311Packages.manifest-ml: disable time-sensitve test --- pkgs/development/python-modules/manifest-ml/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 71d7d3e26d31..927058c773d5 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -95,6 +95,8 @@ buildPythonPackage rec { "test_get" # this test has network access "test_retry_handling" + # Test is time-senstive + "test_timing" ]; meta = with lib; { From 5f1d335782bbe70a9ea681ebde469df9672079c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 08:28:09 +0200 Subject: [PATCH 137/221] python311Packages.manifest-ml: add pythonImportsCheck --- pkgs/development/python-modules/manifest-ml/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 927058c773d5..329f676ef45b 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -99,6 +99,10 @@ buildPythonPackage rec { "test_timing" ]; + pythonImportsCheck = [ + "manifest" + ]; + meta = with lib; { description = "Manifest for Prompting Foundation Models"; homepage = "https://github.com/HazyResearch/manifest"; From 9ee705f63c7129765c49afaf8ac45d374fe9ad25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 06:38:41 +0000 Subject: [PATCH 138/221] python311Packages.botocore-stubs: 1.31.37 -> 1.31.38 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 1deafc6ebbbc..858d758039d7 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.37"; + version = "1.31.38"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-ZeZRd4391XughIGVct/4vhf1sosHDNPl5bnyJmE/7R0="; + hash = "sha256-ZgduwHPPoW+RPMtudt8GsggJdHhgQNY6mo0pdFnryuc="; }; nativeBuildInputs = [ From f20cb39b9bc03686fa2bb457ea3d6fac682d28d7 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Thu, 31 Aug 2023 08:41:09 +0200 Subject: [PATCH 139/221] xrdp: 0.9.22.1 -> 0.9.23 https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.23 Includes fix for https://www.cve.org/CVERecord?id=CVE-2023-40184 --- pkgs/applications/networking/remote/xrdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 0fb74488f0bf..c440b9e5a76e 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -34,7 +34,7 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.22.1"; + version = "0.9.23"; pname = "xrdp"; src = fetchFromGitHub { @@ -42,7 +42,7 @@ let repo = "xrdp"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-8gAP4wOqSmar8JhKRt4qRRwh23coIn0Q8Tt9ClHQSt8="; + hash = "sha256-14qsRfLn+26rm+vyMmOtaBEs8mWfSTIsIVseSC2FjXc="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; From cd6cdb001bb3bb2058324a4612952044628b6e31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 06:50:10 +0000 Subject: [PATCH 140/221] python310Packages.pytado: 0.16.0 -> 0.17.2 --- pkgs/development/python-modules/pytado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index ddd618d6d14f..d32677edf54e 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.16.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; # Upstream hasn't tagged 0.13.0 yet rev = "refs/tags/${version}"; - sha256 = "sha256-tpWr+VlkJ9svN9XtBIDEAos4uxYCl6njvUBPIJG++Yg="; + sha256 = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; }; propagatedBuildInputs = [ From 86c0091f1c1c62ead7f4ceb5ddcb0f9300f1f07d Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Thu, 31 Aug 2023 12:21:35 +0530 Subject: [PATCH 141/221] gitui: add mfrw as maintainer Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/version-management/gitui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix index 2686463da296..b0345bc986de 100644 --- a/pkgs/applications/version-management/gitui/default.nix +++ b/pkgs/applications/version-management/gitui/default.nix @@ -42,6 +42,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/extrawurst/gitui"; changelog = "https://github.com/extrawurst/gitui/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne yanganto ]; + maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; }; } From 7732a57c8704e846ebc2ad8b58aed2745e8fcbda Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Thu, 31 Aug 2023 12:21:52 +0530 Subject: [PATCH 142/221] gitui: 0.23.0 -> 0.24.1 Changelog: https://github.com/extrawurst/gitui/blob/0.24.1/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- .../version-management/gitui/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix index b0345bc986de..2cc262cb12c5 100644 --- a/pkgs/applications/version-management/gitui/default.nix +++ b/pkgs/applications/version-management/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - hash = "sha256-Mz4/Q1EmTg3vXIYbIdr5MtemGrBSkvBBwcfz+McEaJ8="; + hash = "sha256-FcOpLCLoeY+uZA+IMWNxUUbu9yieNVqPl4iiV8BDpTE="; }; - cargoHash = "sha256-hsu3WQfqMnD5frJP6wDcexG7HafXmzs5ZIGePGOBRVs="; + cargoHash = "sha256-UvMtA+2inMLBjQA+17nozI/VrU1NR0A7eym1VyjYoAg="; nativeBuildInputs = [ pkg-config ]; @@ -37,10 +37,18 @@ rustPlatform.buildRustPackage rec { # environment: delete them. postPatch = "rm .cargo/config"; + + # Getting app_config_path fails with a permission denied + checkFlags = [ + "--skip=keys::key_config::tests::test_symbolic_links" + ]; + + meta = with lib; { description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; changelog = "https://github.com/extrawurst/gitui/blob/${version}/CHANGELOG.md"; + mainProgram = "gitui"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; }; From 003c00925a39cd82a8f9658dc9570bf25b8f13dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 05:51:46 +0000 Subject: [PATCH 143/221] liferea: 1.15.1 -> 1.15.2 --- pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 768f56c56d5f..fc2537a3e6d5 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "QOdGltz4wns1vq0Nv/O65koMYkLmPAAP4hKp301dAKI="; + sha256 = "TpuET1VLOXwZHdpYg6vXT1MDGpV0IKbSIduf3bkNbeI="; }; nativeBuildInputs = [ From 95f83b9fd74b79d61df53c9b67fb46d514b58ca9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 07:19:13 +0000 Subject: [PATCH 144/221] python310Packages.google-re2: 1.0 -> 1.1 --- pkgs/development/python-modules/google-re2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index e93b7251a25c..9be7c2f3b953 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-re2"; - version = "1.0"; + version = "1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IcitwpY2DeH/QmuqOMcS6tpiLChY0ZXrSH5BXZQZTpE="; + hash = "sha256-06lGfuUrRqx3ypKPbQy+rM/ZLwPKDw9lud9qlRhPOhw="; }; propagatedBuildInputs = [ From 85fe456b00e927c48b6f685bff0cd405dbe53eeb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:19:27 +0200 Subject: [PATCH 145/221] python310Packages.pytado: remove stale comment --- pkgs/development/python-modules/pytado/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index d32677edf54e..001df5319eac 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -12,7 +12,6 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; - # Upstream hasn't tagged 0.13.0 yet rev = "refs/tags/${version}"; sha256 = "sha256-w1qtSEpnZCs7+M/0Gywz9AeMxUzz2csHKm9SxBKzmz4="; }; From 3cb349b4068c7c845c0a8ec722c622f9ffc97b70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:20:39 +0200 Subject: [PATCH 146/221] python310Packages.pytado: update meta --- pkgs/development/python-modules/pytado/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 001df5319eac..55e3a392224e 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python binding for Tado web API"; homepage = "https://github.com/wmalgadey/PyTado"; - license = licenses.gpl3; + changelog = "https://github.com/wmalgadey/PyTado/releases/tag/${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ ]; }; } From 6fe604d65b337f1a8baadccb75c4b590f7e2b8fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:21:53 +0200 Subject: [PATCH 147/221] python310Packages.pytado: add format - disable on unsupported Python releases --- pkgs/development/python-modules/pytado/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 55e3a392224e..8575fceadc4f 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -3,11 +3,15 @@ , fetchFromGitHub , pytestCheckHook , requests +, pythonOlder }: buildPythonPackage rec { pname = "pytado"; version = "0.17.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wmalgadey"; From 86e6a0b7cc2ecb14f7dd940062482fb12132f02b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:26:52 +0200 Subject: [PATCH 148/221] python311Packages.pysnooz: 0.8.5 -> 0.8.6 Diff: https://github.com/AustinBrunkhorst/pysnooz/compare/refs/tags/v0.8.5...v0.8.6 Changelog: https://github.com/AustinBrunkhorst/pysnooz/blob/v0.8.6/CHANGELOG.md --- pkgs/development/python-modules/pysnooz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnooz/default.nix b/pkgs/development/python-modules/pysnooz/default.nix index 8d4adbb86d13..dd8d6ea4fcde 100644 --- a/pkgs/development/python-modules/pysnooz/default.nix +++ b/pkgs/development/python-modules/pysnooz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pysnooz"; - version = "0.8.5"; + version = "0.8.6"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AustinBrunkhorst"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X7RjI4KytJI9raHAJHLygV3J4zHKuHk8Kq+3JfktPeg="; + hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; }; postPatch = '' From 7d8b350857b8e0e66663911a57ff9b4188be37d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:27:36 +0200 Subject: [PATCH 149/221] python311Packages.pysigma-pipeline-windows: 1.1.0 -> 1.1.1 Diff: https://github.com/SigmaHQ/pySigma-pipeline-windows/compare/refs/tags/v1.1.0...v1.1.1 Changelog: https://github.com/SigmaHQ/pySigma-pipeline-windows/releases/tag/v1.1.1 --- .../python-modules/pysigma-pipeline-windows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 4a05c5067e2a..b6f47d9f4a44 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-windows"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-windows"; rev = "refs/tags/v${version}"; - hash = "sha256-jXUTGt/kbw6XfxA7A+t9km5GdltV1VRBTUf4lw1AwO4="; + hash = "sha256-279+nP5IeZiIjKNhJ2adbcJSDzcu7yqIB5JNFK5CPF0="; }; nativeBuildInputs = [ From d80cc09bfae2112deca15d313805e9b73b3634c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:28:25 +0200 Subject: [PATCH 150/221] python311Packages.pysigma-pipeline-crowdstrike: 1.0.0 -> 1.0.1 Diff: https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike/compare/refs/tags/v1.0.0...v1.0.1 --- .../python-modules/pysigma-pipeline-crowdstrike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index d438078e3cff..7b16c695e97f 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "refs/tags/v${version}"; - hash = "sha256-KHHs39RGksE7Rww8nHHo73+WOUzZaNiD4sZMhBPqqYQ="; + hash = "sha256-koXoBb3iyODQyjOmXSeEvVhYtrxpQtVb2HVqYBFkKrs="; }; nativeBuildInputs = [ From a7a14b73e4d747d6434a465647be565aa7961695 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:30:10 +0200 Subject: [PATCH 151/221] python311Packages.pysigma: 0.9.11 -> 0.10.4 Diff: https://github.com/SigmaHQ/pySigma/compare/refs/tags/v0.9.11...v0.10.4 Changelog: https://github.com/SigmaHQ/pySigma/releases/tag/v0.10.4 --- .../development/python-modules/pysigma/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index c85399eefa24..6ea53e7dadd8 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, jinja2 , packaging , poetry-core , pyparsing @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.9.11"; + version = "0.10.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,19 +24,20 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-lbpx5THSegZK09jREH15RpokmdfOng2vX4tClsc/x/A="; + hash = "sha256-pEw0CmQYwZmfpN1mAv04eeOBTVX6JfW3aKhfofZaKYo="; }; + pythonRelaxDeps = [ + "packaging" + ]; + nativeBuildInputs = [ poetry-core pythonRelaxDepsHook ]; - pythonRelaxDeps = [ - "packaging" - ]; - propagatedBuildInputs = [ + jinja2 packaging pyparsing pyyaml From 76e826d0b17ad44be3b90f3ea94605959787cffd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:31:26 +0200 Subject: [PATCH 152/221] python311Packages.pysigma-backend-opensearch: 1.0.0 -> 1.0.1 Diff: https://github.com/SigmaHQ/pySigma-backend-opensearch/compare/refs/tags/v1.0.0...v1.0.1 Changelog: https://github.com/SigmaHQ/pySigma-backend-opensearch/releases/tag/v1.0.1 --- .../python-modules/pysigma-backend-opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 2252d619d030..3fdfd2bfdd6d 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-erqKAtTNMQQy/zUkpOd0LoQT2MY2mgz5yGuSQJ0QTjI="; + hash = "sha256-g3kGaNq07yMu3mnRDeZB3Ck8wwzK3HcOIzkl36cNOs8="; }; postPatch = '' From 153f0fd87f0bee2d7e26c1fcc067aa62f3f5df26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:31:42 +0200 Subject: [PATCH 153/221] python311Packages.pysigma-backend-splunk: 1.0.2 -> 1.0.3 Diff: https://github.com/SigmaHQ/pySigma-backend-splunk/compare/refs/tags/v1.0.2...v1.0.3 --- .../python-modules/pysigma-backend-splunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 7fcd0092a7d4..bf939afd646c 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "refs/tags/v${version}"; - hash = "sha256-SWD3Jw1wehWLvWkLA7rotweExYCrabq7men22D0zN5w="; + hash = "sha256-ZDRHCzNLwBx8cugNVSkk7lZhE7MzariX0OS4pHv0f1s="; }; nativeBuildInputs = [ From ed562c5d4747ad9fda362d2b6bae8fbd9d9ef5d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:32:22 +0200 Subject: [PATCH 154/221] python311Packages.pysigma-pipeline-sysmon: 1.0.2 -> 1.0.3 Diff: https://github.com/SigmaHQ/pySigma-pipeline-sysmon/compare/refs/tags/v1.0.2...v1.0.3 --- .../python-modules/pysigma-pipeline-sysmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index ccb8e6245e33..9b02a38cb18b 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "refs/tags/v${version}"; - hash = "sha256-W3Osv0RApm6sCVdsLXUB79H3g62yUID4dtBi5Ywk5NY="; + hash = "sha256-5CDwevzD6R1nIcID6C5PV+i6pwY2CLakRC6NUXtmPs8="; }; nativeBuildInputs = [ From 5c4c1312902e56776d249a3d99ea23183a34c8c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:33:38 +0200 Subject: [PATCH 155/221] sigma-cli: 0.7.2 -> 0.7.7 Diff: https://github.com/SigmaHQ/sigma-cli/compare/refs/tags/v0.7.2...v0.7.7 --- pkgs/tools/security/sigma-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index 3ff04a8a630f..bbed9910f251 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.7.2"; + version = "0.7.7"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yzo/BotNzTBjdkaXI1lHntpI5AyW5AbpFu3XtkWpHU4="; + hash = "sha256-Qqe9nJZfCb7xh93ERrV3XpqdtfeRECt7RDca9eQU3eQ="; }; postPatch = '' From fa309425fa73944b92a08c3736ad469f2778d302 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:36:00 +0200 Subject: [PATCH 156/221] python311Packages.aiobiketrax: 1.1.0 -> 1.1.1 Diff: https://github.com/basilfx/aiobiketrax/compare/refs/tags/v1.1.0...v1.1.1 Changelog: https://github.com/basilfx/aiobiketrax/blob/v1.1.1/CHANGELOG.md --- pkgs/development/python-modules/aiobiketrax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobiketrax/default.nix b/pkgs/development/python-modules/aiobiketrax/default.nix index b64c7e103a7e..757c9c1915d5 100644 --- a/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/pkgs/development/python-modules/aiobiketrax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiobiketrax"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "basilfx"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qt2/Wf9qolNF83tf2G5xGFJiLTbOWLPbtCnDfIrKvoI="; + hash = "sha256-YvPWvdA4BslkOLt3IkzSgUgex8h1CjCOVZC6oxNf3ZA="; }; postPatch = '' From 3277291c5d1999bcde122ef6f163caea57a3a3ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:38:09 +0200 Subject: [PATCH 157/221] python310Packages.google-re2: update disabled --- pkgs/development/python-modules/google-re2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index 9be7c2f3b953..1528cb1a59e1 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; From 9c9d9f7f2075eec3e1934d28ec9a3b5f94db39bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:48:10 +0200 Subject: [PATCH 158/221] python311Packages.pyinsteon: 1.4.3 -> 1.5.0 Diff: https://github.com/pyinsteon/pyinsteon/compare/refs/tags/1.4.3...1.5.0 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 948c3fd29bb0..58652559be18 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.4.3"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo="; + hash = "sha256-REm0E7+otqDypVslB5heHEaWA+q3Nh1O96gxFeCC3As="; }; patches = [ From 7a34883bfbb272d9149cfab413e75de9dedb7906 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:50:52 +0200 Subject: [PATCH 159/221] python311Packages.pyinsteon: add changelog to meta --- pkgs/development/python-modules/pyinsteon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 58652559be18..d0081b7a106e 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -69,6 +69,7 @@ buildPythonPackage rec { 2413U, 2412S, 2448A7 and Hub models 2242 and 2245. ''; homepage = "https://github.com/pyinsteon/pyinsteon"; + changelog = "https://github.com/pyinsteon/pyinsteon/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From d7c9dc08d9d9a817dd8611886b1ff2b2f958c812 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 09:51:38 +0200 Subject: [PATCH 160/221] python311Packages.pyinsteon: update disabled --- pkgs/development/python-modules/pyinsteon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index d0081b7a106e..dbf6ab12b44e 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "1.5.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; From 2639087d303c6e211d3d40ffa24e6b2f707506d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 08:11:04 +0000 Subject: [PATCH 161/221] phrase-cli: 2.8.4 -> 2.11.0 --- pkgs/tools/misc/phrase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index a4eba4aaf0a4..3de9148c98ab 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.8.4"; + version = "2.11.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-tYpn93PSvO9g31soDOW0+gOBaypMUlx9Xfo0H3ftJQk="; + sha256 = "sha256-8LhXsrO0sXMu7cXNoLafwNgCO99zGcQBYcCmqJfM2KY="; }; - vendorHash = "sha256-SooYBVXcll8QciK8J68wUAsAH6kN+lWlmPS8h0Hw4e0="; + vendorHash = "sha256-lbJetTERQKnDKmM1VqRWU0OjZPm+bfeQ9ZThs/TzxIU="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; From 44ca3421e57cc3bab7a120c2aa86d28d0a2ec30c Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 31 Aug 2023 18:24:08 +1000 Subject: [PATCH 162/221] wgo: 0.5.1 -> 0.5.3 --- pkgs/development/tools/wgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wgo/default.nix b/pkgs/development/tools/wgo/default.nix index bcd8cb7a0044..0213dfcf7795 100644 --- a/pkgs/development/tools/wgo/default.nix +++ b/pkgs/development/tools/wgo/default.nix @@ -5,7 +5,7 @@ let pname = "wgo"; - version = "0.5.1"; + version = "0.5.3"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "bokwoon95"; repo = "wgo"; rev = "v${version}"; - hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q="; + hash = "sha256-Uny5FiMox0oIaJ+WE7p3kw4guSzktEF+WzuxjgFXh2I="; }; - vendorHash = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A="; + vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU="; ldflags = [ "-s" "-w" ]; From d3e1292425e0f5a9141e5bfe90fe2801631fe036 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 31 Aug 2023 18:30:28 +1000 Subject: [PATCH 163/221] vsce: 2.20.1 -> 2.21.0 --- pkgs/development/tools/vsce/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix index 6b35fb317683..7d80b364c1b6 100644 --- a/pkgs/development/tools/vsce/default.nix +++ b/pkgs/development/tools/vsce/default.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.20.1"; + version = "2.21.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-wwSrECqCNBTfr+Hk0sO6eI64uXCiJuRdCk7HUf5oO4g="; + hash = "sha256-iBbKVfkmt8n06JJ8TSO8BDCeiird9gTkOQhlREtZ5Cw="; }; - npmDepsHash = "sha256-eTyeNvI34+x2ymyQc3qD5WTGIwL+7OjUCK3u2QZhJDQ="; + npmDepsHash = "sha256-Difk9a9TYmfwzP9SawEuaxm7iHVjdfO+FxFCE7aEMzM="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' From 27969c3257e41d08e1b40403565847becbf36918 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 10:33:30 +0200 Subject: [PATCH 164/221] python311Packages.opower: 0.0.32 -> 0.0.33 Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.0.32...v0.0.33 Changelog: https://github.com/tronikos/opower/releases/tag/v0.0.33 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 1ad1f902e3c1..916a4c66b9fc 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.0.32"; + version = "0.0.33"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-zfLulpFEB3KfN2wm1wXYbHZ9opI9k3q0YIWardNPZa0="; + hash = "sha256-YZ9I+Pdfh7i8gtBYnVwIaJSRSG0uU+8hKSCSk391hzc="; }; pythonRemoveDeps = [ From 880cb3a66cd25194799f6f16aacd6cdac1ad9187 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 10:37:32 +0200 Subject: [PATCH 165/221] checkov: 2.4.18 -> 2.4.19 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.4.18...2.4.19 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.4.19 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a94d7e2f3f20..f78582767b93 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.18"; + version = "2.4.19"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iYfqriGCf+dbQx99+l7/636t/ArV2+6YI4SKW3+NLx8="; + hash = "sha256-A3xKXh2btw+ZUZevbhPOqtTHWNx7ohZILpYM/KInGIg="; }; patches = [ From 10dd5ff561df881adcbb2e0a16b429dc3f18d59b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 08:37:47 +0000 Subject: [PATCH 166/221] traceroute: 2.1.2 -> 2.1.3 --- pkgs/tools/networking/traceroute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 9d092aac560c..c0171ea5880d 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "traceroute"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "mirror://sourceforge/traceroute/${pname}-${version}.tar.gz"; - sha256 = "sha256-UHwmjyl3tOIYznPn6+1Fug2XCoykmV3Zy7H/6OmbWx8="; + sha256 = "sha256-BevHq6KKkQD5u65Uzuy/dcgsz0a9/Oi11kgGRZp+BBI="; }; makeFlags = [ From 42b7ffe5611a53db33d4c68997c893b0dc00f653 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 10:43:11 +0200 Subject: [PATCH 167/221] python311Packages.pydiscourse: update ordering - minor formatting tweaks --- .../python-modules/pydiscourse/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pydiscourse/default.nix b/pkgs/development/python-modules/pydiscourse/default.nix index 158954b711b6..d17c719196e1 100644 --- a/pkgs/development/python-modules/pydiscourse/default.nix +++ b/pkgs/development/python-modules/pydiscourse/default.nix @@ -13,10 +13,6 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - nativeCheckInputs = [ - unittestCheckHook - ]; - src = fetchFromGitHub { owner = "pydiscourse"; repo = pname; @@ -24,14 +20,22 @@ buildPythonPackage rec { hash = "sha256-peDkXRcD/ieWYWXqv8hPxTSNRXBHcb/3sj/JJSF2RYg="; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ + requests + ]; - pythonImportsCheck = [ "pydiscourse" ]; + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "pydiscourse" + ]; meta = with lib; { + description = "A Python library for working with Discourse"; homepage = "https://github.com/pydiscourse/pydiscourse"; changelog = "https://github.com/pydiscourse/pydiscourse/releases/tag/v${version}"; - description = "A Python library for working with Discourse"; license = licenses.mit; maintainers = with maintainers; [ Dettorer ]; }; From 3fc5271ce3a37b1496038c7b3d0c0f6e79c01b61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Aug 2023 10:49:57 +0200 Subject: [PATCH 168/221] python310Packages.formulae: add changelog to meta --- pkgs/development/python-modules/formulae/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/formulae/default.nix b/pkgs/development/python-modules/formulae/default.nix index 769918d1b964..ab13f86dc18b 100644 --- a/pkgs/development/python-modules/formulae/default.nix +++ b/pkgs/development/python-modules/formulae/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bambinos.github.io/formulae"; description = "Formulas for mixed-effects models in Python"; + changelog = "https://github.com/bambinos/formulae/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; From 39c97c78d9584f6e2e887ac4f42d1218a2e6b5cb Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 31 Aug 2023 19:09:01 +1000 Subject: [PATCH 169/221] symfony-cli: 5.5.7 -> 5.5.8 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index aee1a2d150a6..acae7f04f6af 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.5.7"; - vendorHash = "sha256-OXV/hTSHJvYfe2SiFamkedC01J/DOgd8I60yIpQToos="; + version = "5.5.8"; + vendorHash = "sha256-hOYVIynWsbsindNJRbXX4NkC3FW3RErORCSLlV1bCWc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-LC6QQIVHllBRu8B6XfV8SuTB3O+FmqYr+LQnVmLj2nU="; + hash = "sha256-K2DttdK8g5NI+XlGwIA9HTPTLlMGgGc1K625FquIhi4="; }; ldflags = [ From 8f3aa7a77daf89746d4130515a65993a3b7ad643 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 09:18:29 +0000 Subject: [PATCH 170/221] janus-gateway: 1.1.4 -> 1.2.0 --- pkgs/servers/janus-gateway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 705037e682bf..d62be801a4ca 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.1.4"; + version = "1.2.0"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kvaO2g4QF6LYZcxv39yXkwY9iZVenJio8oOlRLLH2Kk="; + sha256 = "sha256-YbY7wcd8YHcPo5w4n54gjOtepYLbboLsrLij7oYzhco="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; From 9e91f0a7cf0b2c6d5c7b0c229464584dc3a54617 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 31 Aug 2023 11:57:26 +0200 Subject: [PATCH 171/221] zellij: 0.38.0 -> 0.38.1 --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 18390f656b29..cc69b4550ad0 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.38.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-+i4lY2VB/g6/dwN4dDwsiI+3R299ssBY90fpnvkVrXU="; + hash = "sha256-3khMo5qMG0qonMnPvuErVYFohUrZLAkaxKZzkMHou8E="; }; - cargoHash = "sha256-m6qjzq9eWVNdG2N5g9uCa0EEKgZYqd9xSnPloIQSPgE="; + cargoHash = "sha256-d4UNkbp/ryN/VbK8VO8oYvZ1j6qHKeLRSDqgdT+zIeU="; nativeBuildInputs = [ mandown From af74ef4a777edffb421f439a40a7e825ca1829b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 10:11:08 +0000 Subject: [PATCH 172/221] python310Packages.grpc-interceptor: 0.15.2 -> 0.15.3 --- pkgs/development/python-modules/grpc-interceptor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpc-interceptor/default.nix b/pkgs/development/python-modules/grpc-interceptor/default.nix index bfccc74966ae..a940aa17de74 100644 --- a/pkgs/development/python-modules/grpc-interceptor/default.nix +++ b/pkgs/development/python-modules/grpc-interceptor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "grpc-interceptor"; - version = "0.15.2"; + version = "0.15.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "d5h-foss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zulK0SVehzHcrmgIyH0D5sUOiAN53eIg88IoVyF6/DA="; + hash = "sha256-tTi1X1r7584ZXa12eLp2G/Am8G6Dnd18eE5wF/Lp/EY="; }; patches = [ From 015752db49112d067547f3c62daf23fafe21e3c9 Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 30 Aug 2023 23:54:13 +0200 Subject: [PATCH 173/221] fishPlugins.pure: 4.7.0 -> 4.8.0 --- pkgs/shells/fish/plugins/pure.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 3c7312f8c27a..84142000fbd9 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "pure"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "pure-fish"; repo = "pure"; rev = "v${version}"; - hash = "sha256-2ZNb6aB7rIubTfRVRb42xmCdImQmtGGubo0TBwSPHEo="; + hash = "sha256-O8rC2uCuM3xUQPRap7XqyyAvO77hP+sqNM4mEQ7pZkw="; }; # The tests aren't passing either on the project's CI. From 2dc5c6ef045ad396ca0e6cce0258108541c78d5b Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 29 Aug 2023 12:39:33 +0200 Subject: [PATCH 174/221] fishPlugins.pure: re-enable check phase --- pkgs/shells/fish/plugins/pure.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 84142000fbd9..04334f14fa99 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -1,4 +1,4 @@ -{ lib, buildFishPlugin, fetchFromGitHub, git, fishtape }: +{ lib, buildFishPlugin, fetchFromGitHub, git, fishtape_3 }: buildFishPlugin rec { pname = "pure"; @@ -11,19 +11,11 @@ buildFishPlugin rec { hash = "sha256-O8rC2uCuM3xUQPRap7XqyyAvO77hP+sqNM4mEQ7pZkw="; }; - # The tests aren't passing either on the project's CI. - # The release notes of the program for v3.5.0 say: - # > Tests are going crazy at the moment, should be fixed once fishtape 3.0 - # > is released, and we do the switch. - # This is tracked in https://github.com/pure-fish/pure/issues/272 - # and https://github.com/pure-fish/pure/pull/275. - doCheck = false; - nativeCheckInputs = [ git ]; - checkPlugins = [ fishtape ]; + checkPlugins = [ fishtape_3 ]; checkPhase = '' - # https://github.com/rafaelrinaldi/pure/issues/264 - rm tests/_pure_string_width.test.fish + rm tests/pure_tools_installer.test.fish + rm tests/_pure_uninstall.test.fish fishtape tests/*.test.fish ''; From 363671b9aaf9693a8f009a3e5f1700fd58d6bcf1 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 31 Aug 2023 18:48:37 +0800 Subject: [PATCH 175/221] valent: unstable-2023-07-31 -> unstable-2023-08-26 --- pkgs/applications/misc/valent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 1b8f78cd6180..e60803e5b6ee 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "valent"; - version = "unstable-2023-07-31"; + version = "unstable-2023-08-26"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "698f39b496957d50c68437f16e74a7ac41eb5147"; + rev = "89d1e5a0312a0371bfcd9a95486805917c3729c0"; fetchSubmodules = true; - hash = "sha256-AdW6oMRVIgat8XlH342PEwe6BfkzKVLSadGOTLGwzwo="; + hash = "sha256-28l+SkjVQkOA/5f5nT5BbqIV2BrMLmSK/YtDGYl1xjQ="; }; nativeBuildInputs = [ From 3ffc727b3e55c67c134379d5df7e750876dbdb45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 10:49:10 +0000 Subject: [PATCH 176/221] fsearch: 0.2.2 -> 0.2.3 --- pkgs/tools/misc/fsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index 6af61b122337..a9e3b6caa352 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fsearch"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "cboxdoerfer"; repo = pname; rev = version; - hash = "sha256-1nu6J5eHVpPHGXcFKHSnUhAJccxABBht5H2bpBx42og="; + hash = "sha256-VBcoDxh4ip2zLBcXVHDe9s1lVRQF4bZJKsGUt6sPcos="; }; nativeBuildInputs = [ From f3cf8b679b13adc28b12488850c6b3fa87832258 Mon Sep 17 00:00:00 2001 From: Sagi Sarussi <39622904+tuxiqae@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:43:45 +0300 Subject: [PATCH 177/221] nixos/kanidm: fix broken doc links --- nixos/modules/services/security/kanidm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index d8a99dee59f4..6f4d1dc382ab 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -137,7 +137,7 @@ in default = { }; description = lib.mdDoc '' Settings for Kanidm, see - [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/server_configuration.md) + [the documentation](https://kanidm.github.io/kanidm/stable/server_configuration.html) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/server.toml) for possible values. ''; @@ -155,7 +155,7 @@ in }; description = lib.mdDoc '' Configure Kanidm clients, needed for the PAM daemon. See - [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/client_tools.md#kanidm-configuration) + [the documentation](https://kanidm.github.io/kanidm/stable/client_tools.html#kanidm-configuration) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/config) for possible values. ''; @@ -173,7 +173,7 @@ in }; description = lib.mdDoc '' Configure Kanidm unix daemon. - See [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/pam_and_nsswitch.md#the-unix-daemon) + See [the documentation](https://kanidm.github.io/kanidm/stable/integrations/pam_and_nsswitch.html#the-unix-daemon) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/unixd) for possible values. ''; From 843cdb6f18c3445229c69425c2acbad8c355d86f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 11:14:47 +0000 Subject: [PATCH 178/221] python310Packages.mashumaro: 3.9 -> 3.9.1 --- pkgs/development/python-modules/mashumaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 13bee5c38958..97eeb09d7b8a 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.9"; + version = "3.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oH44poFVnoM831dJuA9KcHCsuW6gh5B2EHrnKwza6A4="; + hash = "sha256-VDB6313lvKuLJFOnuzEaiiRLUBOvbdjfowgl3nvG8Y0="; }; nativeBuildInputs = [ From 72845c89285ca57c1d2bbc33018aca7455cd9c25 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 30 Aug 2023 07:12:25 +0200 Subject: [PATCH 179/221] =?UTF-8?q?ocamlPackages.trace:=200.2=20=E2=86=92?= =?UTF-8?q?=200.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/trace/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/trace/default.nix b/pkgs/development/ocaml-modules/trace/default.nix index 208a879b1d1c..a27a61d4baf1 100644 --- a/pkgs/development/ocaml-modules/trace/default.nix +++ b/pkgs/development/ocaml-modules/trace/default.nix @@ -2,19 +2,19 @@ buildDunePackage rec { pname = "trace"; - version = "0.2"; + version = "0.3"; - minimalOCamlVersion = "4.05"; + minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/c-cube/trace/releases/download/v${version}/trace-${version}.tbz"; - hash = "sha256-iScnZxjgzDqZFxbDDXB0K4TkdDJDcrMC03sK/ltbqJQ="; + url = "https://github.com/c-cube/ocaml-trace/releases/download/${version}/trace-${version}.tbz"; + hash = "sha256-Krq6qYO7tKJktTRjFrdmONPHfjrd81Ighsb9nmG9ZQU="; }; meta = { description = "Common interface for tracing/instrumentation libraries in OCaml"; license = lib.licenses.mit; - homepage = "https://c-cube.github.io/trace/"; + homepage = "https://c-cube.github.io/ocaml-trace/"; maintainers = [ lib.maintainers.vbgl ]; }; From d1a4f8ae22aae94c3e8a1cbaeff3e3bc9e07313e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Aug 2023 22:06:57 +0200 Subject: [PATCH 180/221] =?UTF-8?q?ocamlPackages.earlybird:=201.1.0=20?= =?UTF-8?q?=E2=86=92=201.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/earlybird/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix index 209bf30d2a61..9803a20368c3 100644 --- a/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/pkgs/development/ocaml-modules/earlybird/default.nix @@ -1,30 +1,38 @@ { lib, fetchFromGitHub, ocaml, buildDunePackage , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson +, ppx_optcomp , gitUpdater }: -if lib.versionAtLeast ocaml.version "4.13" -then throw "earlybird is not available for OCaml ${ocaml.version}" -else - buildDunePackage rec { pname = "earlybird"; - version = "1.1.0"; + version = "1.2.1"; - duneVersion = "3"; - - minimalOCamlVersion = "4.11"; + minimalOCamlVersion = "4.12"; src = fetchFromGitHub { owner = "hackwaly"; repo = "ocamlearlybird"; rev = version; - hash = "sha256-8JHZWsgpz2pzpDxST3bkMSmPHtj7MDzD5G3ujqMW+MU="; + hash = "sha256-p29uTdx8+mZKXUL+ng/FzpKuhnykEe8Sy968Wa/KUn4="; }; nativeBuildInputs = [ menhir ]; - buildInputs = [ cmdliner dap fmt iter logs lru lwt_ppx lwt_react menhirLib path_glob ppx_deriving_yojson ]; + buildInputs = [ + cmdliner + dap + fmt + iter + logs + lru + lwt_ppx + lwt_react + menhirLib + path_glob + ppx_deriving_yojson + ppx_optcomp + ]; passthru.updateScript = gitUpdater { }; From ed62b51675d95e4a2563343f1ff8cef3b0587977 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 11:40:34 +0000 Subject: [PATCH 181/221] openmsx: 19.0 -> 19.1 --- pkgs/applications/emulators/openmsx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index 9def450b0345..c9f7827d09ab 100644 --- a/pkgs/applications/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmsx"; - version = "19.0"; + version = "19.1"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-NR0+vOUkbyuVWdHLmKEewDDmR1ibi3dtbSq+6RaxrGo="; + sha256 = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; fetchSubmodules = true; }; From 57838b413399b4e8efbc5603c21651542b37c34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Thu, 31 Aug 2023 13:39:45 +0200 Subject: [PATCH 182/221] mautrix-discord: init at 0.6.1 --- pkgs/servers/mautrix-discord/default.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/servers/mautrix-discord/default.nix diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix new file mode 100644 index 000000000000..bad985e818c6 --- /dev/null +++ b/pkgs/servers/mautrix-discord/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, olm +, nix-update-script +, testers +, mautrix-discord +}: + +buildGoModule rec { + pname = "mautrix-discord"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "mautrix"; + repo = "discord"; + rev = "v${version}"; + hash = "sha256-rs7wWlQMc79Vls+cqPPo+lRzYAGye4WcKKz+9EXlEBo="; + }; + + vendorSha256 = "sha256-ZI1+Tfru2OfnqLnaaiDL08OtSmbMBiRDvkL39+jhhmI="; + + ldflags = [ "-s" "-w" ]; + + buildInputs = [ olm ]; + + doCheck = false; + + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = mautrix-discord; + }; + }; + + meta = with lib; { + description = "A Matrix-Discord puppeting bridge"; + homepage = "https://github.com/mautrix/discord"; + changelog = "https://github.com/mautrix/discord/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ MoritzBoehme ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60f45252c1f1..dbe4792bb558 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9993,6 +9993,8 @@ with pkgs; matrix-hookshot = callPackage ../servers/matrix-synapse/matrix-hookshot { }; + mautrix-discord = callPackage ../servers/mautrix-discord { }; + mautrix-facebook = callPackage ../servers/mautrix-facebook { }; mautrix-googlechat = callPackage ../servers/mautrix-googlechat { }; From cdf9d7c339ce73be4a8814ef38678245ce95e248 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 11:50:20 +0000 Subject: [PATCH 183/221] discord: 0.0.28 -> 0.0.29 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 45ce7c3d1df1..d9ee5d71c49e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.28"; + stable = "0.0.29"; ptb = "0.0.45"; canary = "0.0.166"; development = "0.0.217"; @@ -16,7 +16,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-JwxVVm/QIBLoVyQ2Ff/MX06UNgZ+dAsD960GsCg1M+U="; + sha256 = "sha256-3vjOvkqMD7qKX2zRUbKrw5gHtE/v8WfH557rtagWIWc="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From d1d7cada3ed121683ff6c44b12093eacfa8b49ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 11:57:56 +0000 Subject: [PATCH 184/221] apt: 2.7.2 -> 2.7.3 --- pkgs/tools/package-management/apt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 405c269b2239..74676827fb95 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-CVySyC/O/0zALdrcJHeFm4JjyI0wFdZ5mqcuMwE1my8="; + hash = "sha256-mtLrLE8lzjU12aXYBW4f6TLW27WMJkfNX8jfjJ+N71M="; }; nativeBuildInputs = [ From 7e48af9e0b32de797448e8107a9fe57a30e0c2a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 12:08:33 +0000 Subject: [PATCH 185/221] ayatana-ido: 0.10.0 -> 0.10.1 --- pkgs/development/libraries/ayatana-ido/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index c618a2ee3b5b..85c785be3cb3 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "sha256-jpNsH8c5ObnO+/AqsribvyFZhm7mmCFGNx9p4QHZKQE="; + sha256 = "sha256-uecUyqSL02SRdlLbWIy0luHACTFoyMXQ6rOIYuisZsw="; }; nativeBuildInputs = [ pkg-config cmake ]; From 9f1ced334e310d7cfa34a84ed2c93ae28fea9c18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 12:26:48 +0000 Subject: [PATCH 186/221] CuboCore.corekeyboard: 4.4.0 -> 4.5.0 --- .../misc/cubocore-packages/corekeyboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index bf065bc2a5c7..760fe6b1d2c1 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corekeyboard"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zOH/w4QroMaVjWnFuWAJQ11RYlpXwIXRG9QYGDkfLVY="; + sha256 = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg="; }; nativeBuildInputs = [ From d8bdaf3e75c33feaf9eeb8f3bbfc7fa2e03ebe87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 12:29:25 +0000 Subject: [PATCH 187/221] python310Packages.django-admin-datta: 1.0.7 -> 1.0.10 --- .../development/python-modules/django-admin-datta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index e8561e69df52..795a86d34bf2 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-admin-datta"; - version = "1.0.7"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Onk9T+QKsl8y68eJ2ikrUEeMc9ljzzvSw7cjjP4D3sE="; + hash = "sha256-VV7mb3501aZVuXUqzVqQYUttvkYa4pAECYWn7HksOmI="; }; propagatedBuildInputs = [ From b88f54c7bace57cfc31d8fd8408c045a92f77019 Mon Sep 17 00:00:00 2001 From: Gabriel Simmer Date: Thu, 31 Aug 2023 13:30:45 +0100 Subject: [PATCH 188/221] maintainers: add gmemstr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 89a4e6396af2..1ace5db84120 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6318,6 +6318,12 @@ githubId = 1447245; name = "Robin Gloster"; }; + gmemstr = { + email = "git@gmem.ca"; + github = "gmemstr"; + githubId = 1878840; + name = "Gabriel Simmer"; + }; gnxlxnxx = { email = "gnxlxnxx@web.de"; github = "gnxlxnxx"; From 36a37639fdd7578f4e63156af1947bbe95969ca1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 12:38:19 +0000 Subject: [PATCH 189/221] dos2unix: 7.5.0 -> 7.5.1 --- pkgs/tools/text/dos2unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index a76432d76c05..5505893b4ec6 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.5.0"; + version = "7.5.1"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "sha256-ejsB0B4hTWLCs+BMOpLg3ccoo4VWbkwDVu+mb9brla8="; + sha256 = "sha256-2gd4i7LgKbDWP2Rx0Wb2hSis2Nos8UgjoYjoqdXB/BU="; }; nativeBuildInputs = [ perl gettext ]; From 7efb5f38694eb9c324179fed8f4f977136cfb5fd Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 31 Aug 2023 08:42:36 -0400 Subject: [PATCH 190/221] typstfmt: 0.2.0 -> 0.2.1 Diff: https://github.com/astrale-sharp/typstfmt/compare/0.2.0...0.2.1 Changelog: https://github.com/astrale-sharp/typstfmt/blob/0.2.1/CHANGELOG.md --- pkgs/tools/typesetting/typstfmt/Cargo.lock | 18 +++++++++--------- pkgs/tools/typesetting/typstfmt/default.nix | 5 +++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/typesetting/typstfmt/Cargo.lock b/pkgs/tools/typesetting/typstfmt/Cargo.lock index 38463535b419..5cc5d755f21b 100644 --- a/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "serde", @@ -122,7 +122,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", - "bstr 1.6.0", + "bstr 1.6.2", "fnv", "log", "regex", @@ -198,9 +198,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" -version = "2.6.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "nu-ansi-term" @@ -504,7 +504,7 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.2.0" +version = "0.2.1" dependencies = [ "lexopt", "typstfmt_lib", @@ -512,7 +512,7 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.0" +version = "0.2.1" dependencies = [ "globmatch", "insta", diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index 3292ec177859..2a2fb16d8478 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/tools/typesetting/typstfmt/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-tLkb9KmjkevjGdqqlbcz0jRyBpB079VgqWI81qNPCUw="; + hash = "sha256-cxiT8QVioZ7cGdkxsa8ampwNBWcdpAu4fO1ijfviHhI="; }; cargoLock = { @@ -21,6 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A formatter for the Typst language"; homepage = "https://github.com/astrale-sharp/typstfmt"; + changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda geri1701 ]; }; From 334ce2392b9532c60c86ff62ff5e5b8e4d7bf0df Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 31 Aug 2023 08:46:40 -0400 Subject: [PATCH 191/221] cargo-expand: 1.0.64 -> 1.0.65 Diff: https://github.com/dtolnay/cargo-expand/compare/1.0.64...1.0.65 Changelog: https://github.com/dtolnay/cargo-expand/releases/tag/1.0.65 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 4c1399b5ff44..4227243be4f2 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.64"; + version = "1.0.65"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-8DBkF2JRrsrZTW6gNBiUyVpwFvOpoZnm2vsR4O/6c6c="; + sha256 = "sha256-fPrke89Nlr9Yj0bkB6HTwMymQsjAQ+5+o7iVPGH7Tyc="; }; - cargoHash = "sha256-r5qRxc8Jt5OBWCiBhFs8zPoxbuercsQ7gw5FfOKH3ow="; + cargoHash = "sha256-Q7nBKdwZlL/HleuiniuvErGF6Avf58xR++cJ7PP8RME="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; From 7afe4e3282a9a5fbce0729ad68843fc0572247b5 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 31 Aug 2023 09:30:27 +0300 Subject: [PATCH 192/221] balena-cli: Fix darwin build --- pkgs/tools/admin/balena-cli/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index c687eb994d94..bb674a83f322 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -7,6 +7,7 @@ , nodePackages , python3 , udev +, darwin }: buildNpmPackage rec { @@ -30,10 +31,15 @@ buildNpmPackage rec { nativeBuildInputs = [ nodePackages.node-gyp python3 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.cctools ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ + buildInputs = lib.optionals stdenv.isLinux [ udev + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Cocoa ]; passthru.tests.version = testers.testVersion { From 179964f9e0514278d779fd718663c59e088ccdfc Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 31 Aug 2023 09:40:10 -0400 Subject: [PATCH 193/221] git-mit: 5.12.146 -> 5.12.147 Diff: https://github.com/PurpleBooth/git-mit/compare/v5.12.146...v5.12.147 Changelog: https://github.com/PurpleBooth/git-mit/releases/tag/v5.12.147 --- pkgs/applications/version-management/git-mit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 4c96bc13b44c..16110a69bb41 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.146"; + version = "5.12.147"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-VN1TbK9wi5Nt2K3yKx2lYSP30zSpwNETQ4OyHj8zxBg="; + hash = "sha256-TaYuxyezegPZPWlkYcZk+YhmHqQ/P1nO5D5JC3LN8bo="; }; - cargoHash = "sha256-YtUuRLjmehG+5kUiCo4LK0PkKAckr28UahlrAjm9MYw="; + cargoHash = "sha256-9oqw2rIAhdo5G2GsW7rwHMymgFASKE7OrVqO2ewfG2g="; nativeBuildInputs = [ pkg-config ]; From 8709579b0272334273b50caecc2a492e2979fe14 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Wed, 30 Aug 2023 18:40:31 +0300 Subject: [PATCH 194/221] python311Packages.web3: add hellwolf to maintainers --- pkgs/development/python-modules/web3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index af2dedceed6b..b846c4391f59 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { description = "Web3 library for interactions"; homepage = "https://github.com/ethereum/web3"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ hellwolf ]; }; } From aa3582365788752b915e07e297bfc5e359dd3d18 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Fri, 25 Aug 2023 17:35:13 +0300 Subject: [PATCH 195/221] python311Packages.web3: fix darwin builds - Python ipfshttpclient is an optional dependency of this package, and python ipfshttpclient package is currently broken on darwin. - use passthru.optional-dependencies. - Update description and homepage. - Leave typing-extensions to upstream package conditonal logic. Co-authored-by: OTABI Tomoya --- .../python-modules/web3/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index b846c4391f59..ae709ef40886 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -1,22 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , aiohttp , eth-abi , eth-account , eth-hash , eth-typing , eth-utils -, eth-rlp , hexbytes , ipfshttpclient , jsonschema , lru-dict , protobuf , requests -, typing-extensions , websockets -, pythonOlder }: buildPythonPackage rec { @@ -33,24 +31,25 @@ buildPythonPackage rec { hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; }; + # Note: to reflect the extra_requires in main/setup.py. + passthru.optional-dependencies = { + ipfs = [ ipfshttpclient ]; + }; + propagatedBuildInputs = [ aiohttp eth-abi eth-account - eth-hash - eth-rlp + eth-hash ] ++ eth-hash.optional-dependencies.pycryptodome ++ [ eth-typing eth-utils hexbytes - ipfshttpclient jsonschema lru-dict protobuf requests websockets - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - ] ++ eth-hash.optional-dependencies.pycryptodome; + ]; # TODO: package eth-tester required for tests doCheck = false; @@ -64,8 +63,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Web3 library for interactions"; - homepage = "https://github.com/ethereum/web3"; + description = "A python interface for interacting with the Ethereum blockchain and ecosystem"; + homepage = "https://web3py.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ hellwolf ]; }; From 692675696e0a8624580533c34e90714a074b4d53 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 14:15:36 +0000 Subject: [PATCH 196/221] python311Packages.wcmatch: 8.4.1 -> 8.5 --- pkgs/development/python-modules/wcmatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 689c27a470e2..08b6e1800955 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.4.1"; + version = "8.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-sfBCqJnqTEWLcyHaG14zMePg7HgVg0NN4TAZRs6tuUM="; + hash = "sha256-hsF1ctD3XL87yxoY878vnnKzmpwIybSnTpkeGIKo77M="; }; nativeBuildInputs = [ From e161990d40c97c649a5e7df9d3347c0ea3896bde Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 31 Aug 2023 10:52:59 +0000 Subject: [PATCH 197/221] mailman: remove docutils input In Nixpkgs, we currently have the strange situation where pkgs.docutils (which was being used here) is on a different version than pkgs.python3.pkgs.docutils (which is propagated from sphinx). This led to a conflict here and a build failure. Since we'd need to provide the same version as propagated by sphinx anyway, let's just remove the explicit docutils check input and only use the version propagated by sphinx, avoiding this kind of conflict in future. Fixes: 2312861130ec ("docutils: 0.19 -> 0.20.1") --- pkgs/servers/mail/mailman/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index c92e7a2e3920..20c1771d089f 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -2,7 +2,6 @@ , fetchpatch , python3 , fetchPypi -, docutils , sphinx , postfix , lynx @@ -41,7 +40,6 @@ buildPythonPackage rec { ]; checkInputs = [ - docutils sphinx ]; From f607a7851619a6efda5f7c57f0345018a3ea403c Mon Sep 17 00:00:00 2001 From: Andrew Pan Date: Tue, 29 Aug 2023 12:52:53 -0500 Subject: [PATCH 198/221] emacs-macport: build on LLVM 14 - Build on `apple_sdk_11_0` to support `aarch64-darwin` - Add frameworks required for building on newer SDKs - `Accelerate`, `UniformTypeIdentifiers` - Include header to work around `CF_NOESCAPE` issue circa LLVM 7.0 --- pkgs/applications/editors/emacs/default.nix | 6 ++-- pkgs/applications/editors/emacs/generic.nix | 13 ++++++-- .../editors/emacs/macport_noescape_noop.h | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/editors/emacs/macport_noescape_noop.h diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index a6914a43d413..81e4667c1fb0 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -8,9 +8,9 @@ lib.makeScope pkgs.newScope (self: inherit gconf; inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz - QuartzCore WebKit; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) + Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit + Quartz QuartzCore UniformTypeIdentifiers WebKit; }; in { sources = import ./sources.nix { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 9da821de3f54..494355b4353e 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -42,7 +42,7 @@ , libtiff , libwebp , libxml2 -, llvmPackages_6 +, llvmPackages_14 , m17n_lib , makeWrapper , motif @@ -99,6 +99,7 @@ else "lucid") # macOS dependencies for NS and macPort +, Accelerate , AppKit , Carbon , Cocoa @@ -109,6 +110,7 @@ , OSAKit , Quartz , QuartzCore +, UniformTypeIdentifiers , WebKit }: @@ -135,7 +137,7 @@ let ]; inherit (if variant == "macport" - then llvmPackages_6.stdenv + then llvmPackages_14.stdenv else stdenv) mkDerivation; in mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { @@ -287,6 +289,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { GSS ImageIO ] ++ lib.optionals (variant == "macport") [ + Accelerate AppKit Carbon Cocoa @@ -294,6 +297,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { OSAKit Quartz QuartzCore + UniformTypeIdentifiers WebKit # TODO are these optional? GSS @@ -337,6 +341,11 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { ++ lib.optional withXwidgets "--with-xwidgets" ; + # Fixes intermittent segfaults when compiled with LLVM >= 7.0. + # See https://github.com/NixOS/nixpkgs/issues/127902 + env.NIX_CFLAGS_COMPILE = lib.optionalString (variant == "macport") + "-include ${./macport_noescape_noop.h}"; + enableParallelBuilding = true; installTargets = [ "tags" "install" ]; diff --git a/pkgs/applications/editors/emacs/macport_noescape_noop.h b/pkgs/applications/editors/emacs/macport_noescape_noop.h new file mode 100644 index 000000000000..64c65bd90f88 --- /dev/null +++ b/pkgs/applications/editors/emacs/macport_noescape_noop.h @@ -0,0 +1,31 @@ +#ifndef NOESCAPE_NOOP_H_ +#define NOESCAPE_NOOP_H_ + +// First, do some work to get definitions for *_WIDTH. Normally, Emacs would +// have these defined by headers in-tree, but clang's headers clash with those. +// Due to how include paths work, we have to include clang headers if we want to +// mess with CoreFoundation definitions. +#pragma push_macro("__STDC_VERSION__") +// Make the preprocessor think that we're on C2x. The macros we want are gated +// on it. +#undef __STDC_VERSION__ +#define __STDC_VERSION__ 202000L +// Include limits.h first, as stdint.h includes it. +#include + +// XX: clang's stdint.h is shy and won't give us its defs unless it thinks it's +// in freestanding mode. +#undef __STDC_HOSTED__ +#include +#define __STDC_HOSTED__ 1 + +#pragma pop_macro("__STDC_VERSION__") + +// Now, pull in the header that defines CF_NOESCAPE. +#include + +// Redefine CF_NOESCAPE as empty. +#undef CF_NOESCAPE +#define CF_NOESCAPE + +#endif // NOESCAPE_NOOP_H_ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d224d4d18d8..fd090b3b28f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31492,7 +31492,7 @@ with pkgs; em = callPackage ../applications/editors/em { }; - inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) + inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { })) emacs28 emacs28-gtk2 emacs28-gtk3 From 75b7e0ddd6337377e3de91505e7952de1a44dd51 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 31 Aug 2023 11:14:44 +0200 Subject: [PATCH 199/221] hugo: 0.117.0 -> 0.118.2 https://github.com/gohugoio/hugo/releases/tag/v0.118.2 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index cdf75cb75cc1..a61ddb0e6e63 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.117.0"; + version = "0.118.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WxYTlEqTWY78lHd+qEvmbRmbC6Ewph9U84SjvrlqgtY="; + hash = "sha256-kEcLcNdhUjCTBfBVMYh+/5xxiCrGWeW8my//FcyXWtA="; }; - vendorHash = "sha256-yjARpHewjCm2W/08xu7O/PlE9jIOgYmunEyGEfTHNQs="; + vendorHash = "sha256-FXL6MtZ3kQOlzFuAWdnRoj/0b+XIWy2avuXbU5gz7Bc="; doCheck = false; From 621ea0a5d090a1e779b6d8ad57e475dec6d46715 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 31 Aug 2023 16:53:41 +0200 Subject: [PATCH 200/221] php83: 8.3.0beta3 -> 8.3.0RC1 --- pkgs/development/interpreters/php/8.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 0e7d7111f245..2c529a3ec965 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,12 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0beta3"; + version = "8.3.0RC1"; hash = null; })).overrideAttrs (oldAttrs: { src = fetchurl { - url = "https://downloads.php.net/~eric/php-8.3.0beta3.tar.xz"; - hash = "sha256-XW3t9BOsBFvThYXF66faVl8VyMLFB+Oi7h45vWUmE6Y="; + url = "https://downloads.php.net/~jakub/php-8.3.0RC1.tar.xz"; + hash = "sha256-pWnkxSIhzKU8Cp+AiGzqhqRtWoJu+zBfCM45n2ugH7c="; }; }); in From 118a61fadd13b186df175cee2aa16762e9d29724 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 31 Aug 2023 09:17:49 -0500 Subject: [PATCH 201/221] tamarin-prover: 1.6.1 -> 1.8.0 Signed-off-by: Austin Seipp --- .../science/logic/tamarin-prover/default.nix | 53 +++++++++++-------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index d5d6512c734a..09ef2d7d4637 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -4,12 +4,12 @@ }: let - version = "1.6.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; rev = version; - sha256 = "sha256:0cz1v7k4d0im749ag632nc34n91b51b0pq4z05rzw1p59a5lza92"; + sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww="; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -51,6 +51,7 @@ let doHaddock = false; # broken libraryHaskellDepends = (with haskellPackages; [ aeson aeson-pretty parallel uniplate + regex-pcre-builtin regex-posix split ]) ++ [ tamarin-prover-utils tamarin-prover-term ]; }); @@ -62,31 +63,37 @@ let ]) ++ [ tamarin-prover-theory ]; }); + tamarin-prover-accountability = mkDerivation (common "tamarin-prover-accountability" (src + "/lib/accountability") // { + postPatch = "cp --remove-destination ${src}/LICENSE ."; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + raw-strings-qq + ]) ++ [ + tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + ]; + }); + + tamarin-prover-export = mkDerivation (common "tamarin-prover-export" (src + "/lib/export") // { + postPatch = "cp --remove-destination ${src}/LICENSE ."; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + HStringTemplate + ]) ++ [ + tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + tamarin-prover-sapic + ]; + }); + in mkDerivation (common "tamarin-prover" src // { isLibrary = false; isExecutable = true; - patches = [ - # Backport unreleased patch allowing maude 3.2.1 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.2.1.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch"; - sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg"; - }) - # Backport unreleased patch allowing maude 3.2.2 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.2.2.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch"; - sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy"; - }) - # Backport proposed patch allowing maude 3.3 and 3.3.1 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.3.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch"; - sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681"; - }) - ]; + patches = [ ]; # strip out unneeded deps manually doHaddock = false; @@ -118,6 +125,8 @@ mkDerivation (common "tamarin-prover" src // { resourcet shakespeare threads wai warp yesod-core yesod-static ]) ++ [ tamarin-prover-utils tamarin-prover-sapic + tamarin-prover-accountability + tamarin-prover-export tamarin-prover-term tamarin-prover-theory ]; From f1012af12f8e022d5bd5378caa5964dd25a4bb76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 16:04:07 +0000 Subject: [PATCH 202/221] dpkg: 1.21.22 -> 1.22.0 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 9e9d76b6a495..79bf6f8c5083 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.21.22"; + version = "1.22.0"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; rev = "applied/${version}"; - hash = "sha256-tP2PNUrq90CXVDJZM7TG42dSEUVW2iQjaOVRjF7leSc="; + hash = "sha256-q+kP0PuQyGKuKahA1/TwtJG380a/sNR433xZhxvGO9M="; }; configureFlags = [ From 6881f7264a03956968039ddbe096a99b61d2a35a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 16:17:24 +0000 Subject: [PATCH 203/221] pdns-recursor: 4.9.0 -> 4.9.1 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 7bd5f874b143..0c714cce59c0 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-028WKEPjZ2RqZhp4XKC+zem2hVKFW/QFMq66+hA5ZvM="; + sha256 = "sha256-Ch7cE+jyvWYfOeMWOH2UHiLeagO4p6L8Zi/fi5Quor4="; }; nativeBuildInputs = [ pkg-config ]; From bad50db3c9d6d6a265049a95393964cd522950cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 16:29:03 +0000 Subject: [PATCH 204/221] python311Packages.clr-loader: 0.2.5 -> 0.2.6 --- pkgs/development/python-modules/clr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clr-loader/default.nix b/pkgs/development/python-modules/clr-loader/default.nix index 213a57ff0621..c0122a0d3d9d 100644 --- a/pkgs/development/python-modules/clr-loader/default.nix +++ b/pkgs/development/python-modules/clr-loader/default.nix @@ -12,11 +12,11 @@ let pname = "clr-loader"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { pname = "clr_loader"; inherit version; - hash = "sha256-gu1ftlRynRT9iCludLtrhOss+5dv9LfUnU5En9eKIms="; + hash = "sha256-AZNIrmtqg8ekBtFFN8J3zs96OlOyY+w0LIHe1YRaZ+4="; }; # This buildDotnetModule is used only to get nuget sources, the actual From c7bb13c661e20f49cbe3af71e61e66968ec803bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Thu, 24 Aug 2023 04:38:32 +0900 Subject: [PATCH 205/221] blackshades: 2.4.9 -> 2.5.1 --- pkgs/games/blackshades/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 80fc72341501..7f1cd29c9d54 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -6,22 +6,22 @@ , libGLU , libsndfile , openal -, zig_0_9 +, zig_0_11 }: stdenv.mkDerivation (finalAttrs: { pname = "blackshades"; - version = "2.4.9"; + version = "2.5.1"; src = fetchFromSourcehut { owner = "~cnx"; repo = "blackshades"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Hg+VcWI28GzY/CPm1lUftP0RGztOnzizrKJQVTmeJ9I="; + hash = "sha256-qdpXpuXHr9w2XMfgOVveWv3JoqdJHVB8TCqZdyaw/DM="; }; - nativeBuildInputs = [ zig_0_9.hook ]; + nativeBuildInputs = [ zig_0_11.hook ]; buildInputs = [ glfw @@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sr.ht/~cnx/blackshades"; description = "A psychic bodyguard FPS"; + changelog = "https://git.sr.ht/~cnx/blackshades/refs/${finalAttrs.version}"; + mainProgram = "blackshades"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ McSinyx viric ]; platforms = lib.platforms.linux; From 6c7ac3f2f30a6a98ebb9ea0f14a28e71ca848bd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 17:06:18 +0000 Subject: [PATCH 206/221] daemon: 0.8.2 -> 0.8.4 --- pkgs/tools/system/daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 3c8689416c2f..7d63b12850ea 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "daemon"; - version = "0.8.2"; + version = "0.8.4"; src = fetchurl { url = "http://libslack.org/daemon/download/daemon-${version}.tar.gz"; - sha256 = "sha256-s0s3VDu6Q70Ibln0t1TIECOArlwXKLmHyJDV2ktM88o="; + sha256 = "sha256-+iiFmtNBywoLASwRwnGBT4cEggE7SfcQYAMh03mIfNE="; }; makeFlags = [ From acf53d31d64c1a556563376a46cdb95827ac3b78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 17:33:09 +0000 Subject: [PATCH 207/221] ocamlPackages.lame: 0.3.6 -> 0.3.7 --- pkgs/development/ocaml-modules/lame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lame/default.nix b/pkgs/development/ocaml-modules/lame/default.nix index 5d65bb95101c..2e23a3715dac 100644 --- a/pkgs/development/ocaml-modules/lame/default.nix +++ b/pkgs/development/ocaml-modules/lame/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lame"; - version = "0.3.6"; + version = "0.3.7"; minimalOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "savonet"; repo = "ocaml-lame"; rev = "v${version}"; - sha256 = "sha256-oRxP1OM0pGdz8CB+ou7kbbrNaB1x9z9KTfciLsivFnI="; + sha256 = "sha256-/ZzoGFQQrBf17TaBPSFDQ1yHaQnva56YLmscOacrKBI="; }; nativeBuildInputs = [ pkg-config ]; From b9540d2fe95240edde9966a3eb2e86de1153540b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 17:35:32 +0000 Subject: [PATCH 208/221] python310Packages.zigpy: 0.56.4 -> 0.57.0 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index c73600df5a52..77fb2ac72c42 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.56.4"; + version = "0.57.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-PxvTg/z7WmJaH/iwHoJu2bQDLR4G5nkMS5fSP46C3mQ="; + hash = "sha256-79TOt3PRvkhuF6wf+acYhhzFFkYX0l3yLpxv8dNRk1U="; }; postPatch = '' From b421be37da1c92fbf2cec7363c78b465cb90d0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= Date: Thu, 31 Aug 2023 20:01:31 +0200 Subject: [PATCH 209/221] maintainers: Add frederictobaisc --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1ace5db84120..b89f1c566134 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5814,6 +5814,12 @@ githubId = 7551358; name = "Frede Emil"; }; + frederictobiasc = { + email = "dev@ntr.li"; + github = "frederictobiasc"; + githubId = 26125115; + name = "Frédéric Christ"; + }; Freed-Wu = { email = "wuzhenyu@ustc.edu"; github = "Freed-Wu"; From bb555fb845fe47d47a944cefdebd28a7c3a74682 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 18:56:25 +0000 Subject: [PATCH 210/221] python310Packages.py-partiql-parser: 0.3.6 -> 0.3.7 --- pkgs/development/python-modules/py-partiql-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 481d73134178..c6c35ebd297d 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.6"; + version = "0.3.7"; format = "pyproject"; src = fetchFromGitHub { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-wfVADL87ObJbuYQ2MYcRH0DCOGymS6+mrp7pAIKoS4Q="; + hash = "sha256-RObJSvkqD3T8i470po/CayGC/ae8J6rFQROsrQ1EAGs="; }; nativeBuildInputs = [ From 0f4255bf112a34a6d4f8a159d2444d176f2d79db Mon Sep 17 00:00:00 2001 From: Andrew Pan Date: Thu, 31 Aug 2023 12:53:48 -0500 Subject: [PATCH 211/221] emacs: fix `env` shallow merge Fixes regression caused by #252244. `env` was first defined in its own attrset, which was merged with a second attrset: ```nix ... { env = { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; }; } // { ... env.NIX_CFLAGS_COMPILE = ... ... } ``` In this situation, the `env` from the first attrset is not preserved, since `//` does a shallow merge. Signed-off-by: Andrew Pan --- pkgs/applications/editors/emacs/generic.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 494355b4353e..77adcd27f500 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -140,12 +140,7 @@ let then llvmPackages_14.stdenv else stdenv) mkDerivation; in -mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { - env = { - NATIVE_FULL_AOT = "1"; - LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; - }; -} // { +mkDerivation (finalAttrs: { pname = pname + (if noGui then "-nox" else if variant == "macport" then "-macport" @@ -341,10 +336,14 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { ++ lib.optional withXwidgets "--with-xwidgets" ; - # Fixes intermittent segfaults when compiled with LLVM >= 7.0. - # See https://github.com/NixOS/nixpkgs/issues/127902 - env.NIX_CFLAGS_COMPILE = lib.optionalString (variant == "macport") - "-include ${./macport_noescape_noop.h}"; + env = lib.optionalAttrs withNativeCompilation { + NATIVE_FULL_AOT = "1"; + LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths; + } // lib.optionalAttrs (variant == "macport") { + # Fixes intermittent segfaults when compiled with LLVM >= 7.0. + # See https://github.com/NixOS/nixpkgs/issues/127902 + NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}"; + }; enableParallelBuilding = true; @@ -405,4 +404,4 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { meta = meta // { broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; -})) +}) From 0e43eb9c645704f9443651b7c3318eb6c055805c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 19:23:41 +0000 Subject: [PATCH 212/221] lr: 1.5.1 -> 1.6 --- pkgs/tools/system/lr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 2bb49bf9803d..806b329196a2 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lr"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1wv2acm4r5y5gg6f64v2hiwpg1f3lnr4fy1a9zssw77fmdc7ys3j"; + sha256 = "sha256-TcP0jLFemdmWzGa4/RX7N6xUUTgKsI7IEOD7GfuuPWI="; }; makeFlags = [ "PREFIX=$(out)" ]; From b25c5289d76a106d8bc302872a8c6dc25ddb23cc Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 31 Aug 2023 16:35:58 -0400 Subject: [PATCH 213/221] spacer: 0.1.8 -> 0.2 Diff: https://github.com/samwho/spacer/compare/v0.1.8...v0.2 Changelog: https://github.com/samwho/spacer/releases/tag/v0.2 --- pkgs/tools/misc/spacer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/spacer/default.nix b/pkgs/tools/misc/spacer/default.nix index f6c6db98998e..4452b72ba836 100644 --- a/pkgs/tools/misc/spacer/default.nix +++ b/pkgs/tools/misc/spacer/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.1.8"; + version = "0.2"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-F2PrBlS9uL6BQtjNNabCpl3ofavsUGlBy/Hotm42Oec="; + hash = "sha256-6RGwOyp/TzO7Z2xpcNFtAb+UaiMmgiuac9nqZs4fC10="; }; - cargoHash = "sha256-aeXvqgSKRvm9W6sc5XCkwhMYUncj8pEPyQpYQr+fj7Y="; + cargoHash = "sha256-XWXrivx0TJZmu5jJYJAzKm6dzqOwiWwU8mRuehZkQbA="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; From 127ea2d80e3b08608807909216bc6e46618e4699 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 31 Aug 2023 13:40:13 -0700 Subject: [PATCH 214/221] htop: fix configure.am error with --enable-sensors Commit 23c81659b5de67f4cf032e31c024a8b1a283fc45 didn't get the configure flag quite right. According to https://github.com/htop-dev/htop/blob/main/configure.ac#L671, it's `--enable-sensors`, not `--with-sensors`. I tested this out locally with ``` programs.htop = { enable = true; package = pkgs.htop.overrideAttrs (prev: { configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" "--enable-affinity" "--enable-capabilities" "--enable-delayacct" "--enable-sensors" ]; }); }; ``` --- pkgs/tools/system/htop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index c00f25780839..50c6ea461f36 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { "--enable-capabilities" "--enable-delayacct" ] - ++ lib.optional sensorsSupport "--with-sensors" + ++ lib.optional sensorsSupport "--enable-sensors" ; postFixup = From 451ae26ed246f1c1297a2012c88e9ac67369c105 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 31 Aug 2023 14:06:35 -0700 Subject: [PATCH 215/221] python310Packages.hdfs: 2.5.8 -> 2.7.2 (#251851) * python310Packages.hdfs: 2.5.8 -> 2.7.2 * python310Packages.hdfs: add changelog to meta * python310Packages.hdfs: remove obsolete comment --------- Co-authored-by: Fabian Affolter Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/development/python-modules/hdfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hdfs/default.nix b/pkgs/development/python-modules/hdfs/default.nix index c00bd18640b6..45bd4faf4462 100644 --- a/pkgs/development/python-modules/hdfs/default.nix +++ b/pkgs/development/python-modules/hdfs/default.nix @@ -11,14 +11,13 @@ buildPythonPackage rec { pname = "hdfs"; - # See https://github.com/mtth/hdfs/issues/176. - version = "2.5.8"; + version = "2.7.2"; src = fetchFromGitHub { owner = "mtth"; repo = pname; - rev = version; - hash = "sha256-94Q3IUoX1Cb+uRqvsfpVZJ1koJSx5cQ3/XpYJ0gkQNU="; + rev = "refs/tags/v${version}"; + hash = "sha256-KXJDQEc4+T9r8sB41SOgcx8Gth3qAOZceoOpsLbJ+ak="; }; propagatedBuildInputs = [ docopt requests six ]; @@ -30,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API and command line interface for HDFS"; homepage = "https://github.com/mtth/hdfs"; + changelog = "https://github.com/mtth/hdfs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; From 8068ea271a2a9c4bd7a3bbf0b7280e01c8729a31 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 31 Aug 2023 17:08:29 -0400 Subject: [PATCH 216/221] expr: 1.14.3 -> 1.15.0 (#252565) Diff: https://github.com/antonmedv/expr/compare/v1.14.3...v1.15.0 Changelog: https://github.com/antonmedv/expr/releases/tag/v1.15.0 --- pkgs/development/interpreters/expr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index d2f4816e0ae5..bc9145bf3403 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.14.3"; + version = "1.15.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-4BYFFuoKI5EdxBrgMi33PgjXL6TI7jOQ8H7jLlNKfks="; + hash = "sha256-UZUy2qZQh5vGWVw08ZSJTTy6Obh2dIHkk7p1G+B0du0="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-vQmQdPmfZtudnFqqNeMRdbRVytpbcCt/wH1xSTO+cMQ="; + vendorHash = "sha256-RnrM7L1QppUPBi3sJ4xM/UChFHADEpAA36JaURP7Vo4="; ldflags = [ "-s" "-w" ]; From d0ad5703716b6b7db33a8dae1d115529774f8d57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 31 Aug 2023 14:10:39 -0700 Subject: [PATCH 217/221] mozjpeg: 4.1.3 -> 4.1.4 (#252619) --- pkgs/applications/graphics/mozjpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 34a9bcd161c6..3cb4b001124f 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libpng, zlib, nasm }: stdenv.mkDerivation rec { - version = "4.1.3"; + version = "4.1.4"; pname = "mozjpeg"; src = fetchFromGitHub { owner = "mozilla"; repo = "mozjpeg"; rev = "v${version}"; - sha256 = "sha256-KbePLQu/BfPCZ4edTyo5NbFvvwd0h8ZfaLE25CDJjmw="; + sha256 = "sha256-F9W7tWfcNP2UNuwMbYiSvS8BnFq4ob//b8AXXrRjVuA="; }; cmakeFlags = [ "-DENABLE_STATIC=NO" "-DPNG_SUPPORTED=TRUE" ]; # See https://github.com/mozilla/mozjpeg/issues/351 From 8ddac5f5e2eb6b15173a5f4ce7054aeb216cdd9a Mon Sep 17 00:00:00 2001 From: Samuel Rounce Date: Mon, 22 May 2023 18:19:51 +0100 Subject: [PATCH 218/221] terraform-providers.doppler: init at 1.2.4 Add Doppler Terraform provider --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5631b6ba74d1..0031fb03971c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -353,6 +353,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, + "doppler": { + "hash": "sha256-VwyJrgPiZW9DzAFS3SeLxV6sdVjD5MzsekOSg3ByhXk=", + "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", + "owner": "DopplerHQ", + "repo": "terraform-provider-doppler", + "rev": "v1.2.4", + "spdx": "Apache-2.0", + "vendorHash": "sha256-Z5GKIty78BUFF3VbTcsZKi437gw/kOIHEKkAYu3uB2o=" + }, "elasticsearch": { "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", "homepage": "https://registry.terraform.io/providers/phillbaker/elasticsearch", From 66c49eba0d6c2c5520f4e38ef8dbacc5f460b317 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 22:48:17 +0000 Subject: [PATCH 219/221] aliyun-cli: 3.0.177 -> 3.0.179 --- pkgs/tools/admin/aliyun-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 402af6119636..d237e4f748f9 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.177"; + version = "3.0.179"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-A63cRbIEXsX8mmbbXqsT7athWN8vrZLRnUyurb0HNDA="; + sha256 = "sha256-AQsmk5Kl/uGUeT3hNEuqg28q+hXtkz3E7J2Q0FOdr8U="; }; vendorHash = "sha256-81z4bflVzDCl6IiYnTwFPsLHXq87OiKv4aDmZq05Nqc="; From fbf7cd5729674a0e9ca5358a9cb6dfe7c16ca6b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Aug 2023 22:49:28 +0000 Subject: [PATCH 220/221] python311Packages.argilla: 1.13.2 -> 1.15.0 --- pkgs/development/python-modules/argilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 24b9668d12b0..4ef9c171d2b2 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.13.2"; + version = "1.15.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FCPlEbgViWZEyXpdtaa6pJxpgbSXmcfJX/1RUFF7Zs4="; + hash = "sha256-CEB2Q+8JJmYWeqKS1QuOysedCSuPWXcljlmaclwZzmY="; }; pythonRelaxDeps = [ From ec417504b06a79aa3d4335b8fd055397061e34d0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 31 Aug 2023 12:43:59 +0900 Subject: [PATCH 221/221] python310Packages.bentoml: 1.1.3 -> 1.1.4 Diff: https://github.com/bentoml/BentoML/compare/v1.1.3...v1.1.4 Changelog: https://github.com/bentoml/BentoML/releases/tag/v1.1.4 --- pkgs/development/python-modules/bentoml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index ff3a52809946..b09a029f307c 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -68,7 +68,7 @@ }: let - version = "1.1.3"; + version = "1.1.4"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -104,7 +104,7 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "v${version}"; - hash = "sha256-RJDFjFxTO7UhGZQB8flXug0xCpFdJqLlCZUu0O5W1YE="; + hash = "sha256-aGSw40haVGo4UpUItStsFxfgjAnY4Rhiat4qDUIINWU="; }; pythonRelaxDeps = [