diff options
Diffstat (limited to 'pkgs')
72 files changed, 4351 insertions, 545 deletions
diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index ef4ab30eb2c65..bb668867da146 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-eI2MRrW6MID4dMHR1OjDT83xd/9CgDuhAWpEHmhnMVw="; + hash = "sha256-7sgAp9/CKKxPr8rWbOot+FPAwaC8EPLa9pjVcC4TjW8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-hbh4kfQcym0n2cCp2ebljQpizolsxyfZk7ctKOlDybA="; + hash = "sha256-Va7qLC6WvsLmG9JVmdT1FdIlWP4W/EFmsy7JOagQ+X8="; }; patches = [ diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix new file mode 100644 index 0000000000000..a6b3ca0d66c3d --- /dev/null +++ b/pkgs/applications/emulators/86box/default.nix @@ -0,0 +1,74 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, makeWrapper, freetype, SDL2 +, glib, pcre2, openal, rtmidi, fluidsynth, jack2, alsa-lib, qt5, libvncserver +, discord-gamesdk, libpcap + +, enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch +, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch +, enableVncRenderer ? false +, unfreeEnableDiscord ? false +}: + +stdenv.mkDerivation rec { + pname = "86Box"; + version = "3.11"; + + src = fetchFromGitHub { + owner = "86Box"; + repo = "86Box"; + rev = "v${version}"; + hash = "sha256-n3Q/NUiaC6/EZyBUn6jUomnQCqr8tvYKPI5JrRRFScI="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + freetype + SDL2 + glib + openal + rtmidi + pcre2 + jack2 + libpcap + qt5.qtbase + qt5.qttools + ] ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional enableVncRenderer libvncserver; + + cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" + ++ lib.optional enableNewDynarec "-DNEW_DYNAREC=ON" + ++ lib.optional enableVncRenderer "-DVNC=ON" + ++ lib.optional (!enableDynarec) "-DDYNAREC=OFF" + ++ lib.optional (!unfreeEnableDiscord) "-DDISCORD=OFF"; + + # Some libraries are loaded dynamically, but QLibrary doesn't seem to search + # the runpath, so use a wrapper instead. + postFixup = let + libPath = lib.makeLibraryPath ([ + libpcap + fluidsynth + ] ++ lib.optional unfreeEnableDiscord discord-gamesdk); + libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + '' + wrapProgram $out/bin/86Box \ + "''${qtWrapperArgs[@]}" \ + --prefix ${libPathVar} : "${libPath}" + ''; + + # Do not wrap twice. + dontWrapQtApps = true; + + meta = with lib; { + description = "Emulator of x86-based machines based on PCem."; + homepage = "https://86box.net/"; + license = with licenses; [ gpl2Only ] ++ optional unfreeEnableDiscord unfree; + maintainers = [ maintainers.jchw ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 28ce1cbc3dc3b..4a793e1adc8a9 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -1,104 +1,103 @@ -{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook, wrapGAppsHook - -# Dynamic libraries -, alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat -, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor -, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst -, libxcb, libuuid, libxshmfence, nspr, nss, pango, mesa - -, systemd +{ lib +, stdenv +, fetchFromGitHub +, fetchYarnDeps +, makeDesktopItem +, copyDesktopItems +, desktopToDarwinBundle +, fixup_yarn_lock +, makeWrapper +, nodejs +, yarn +, electron }: stdenv.mkDerivation rec { pname = "drawio"; version = "21.2.1"; - src = fetchurl { - url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-269kMXKGlGig4Dt7cvCTRDGFsBZE5RBoi1ajqT3rIVc="; + src = fetchFromGitHub { + owner = "jgraph"; + repo = "drawio-desktop"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-sjJZwVQdFAMWdaGUyQbv1qfdJWE2tN90z7eFYyAW9ko="; + }; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-YlJ84psoEgeDnCX+O8TvwqhTthm5voJ6dfTvTiZlkuk="; }; nativeBuildInputs = [ - autoPatchelfHook - rpmextract - wrapGAppsHook - ]; + copyDesktopItems + fixup_yarn_lock + makeWrapper + nodejs + yarn + ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; - buildInputs = [ - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libxshmfence - libXtst - libxcb - libuuid - mesa # for libgbm - nspr - nss - pango - systemd - ]; + ELECTRON_SKIP_BINARY_DOWNLOAD = true; - runtimeDependencies = [ - (lib.getLib systemd) - ]; + configurePhase = '' + runHook preConfigure - dontBuild = true; - dontConfigure = true; + export HOME="$TMPDIR" + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ - unpackPhase = "rpmextract ${src}"; + runHook postConfigure + ''; - installPhase = '' - mkdir -p $out/share - cp -r opt/drawio $out/share/ + buildPhase = '' + runHook preBuild - # Application icon - mkdir -p $out/share/icons/hicolor - cp -r usr/share/icons/hicolor/* $out/share/icons/hicolor/ + yarn --offline run electron-builder --dir \ + --config electron-builder-linux-mac.json \ + -c.electronDist=${electron}/lib/electron \ + -c.electronVersion=${electron.version} - # XDG desktop item - cp -r usr/share/applications $out/share/applications + runHook postBuild + ''; - # Symlink wrapper - mkdir -p $out/bin - ln -s $out/share/drawio/drawio $out/bin/drawio + installPhase = '' + runHook preInstall - # Update binary path - substituteInPlace $out/share/applications/drawio.desktop \ - --replace /opt/drawio/drawio $out/bin/drawio - ''; + mkdir -p "$out/share/lib/drawio" + cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio" - doInstallCheckPhase = true; + install -Dm644 build/icon.svg "$out/share/icons/hicolor/scalable/apps/drawio.svg" - installCheckPhase = '' - $out/bin/drawio --help > /dev/null + makeWrapper '${electron}/bin/electron' "$out/bin/drawio" \ + --add-flags "$out/share/lib/drawio/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --inherit-argv0 + + runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "drawio"; + exec = "drawio %U"; + icon = "drawio"; + desktopName = "drawio"; + comment = "draw.io desktop"; + mimeTypes = [ "application/vnd.jgraph.mxfile" "application/vnd.visio" ]; + categories = [ "Graphics" ]; + startupWMClass = "drawio"; + }) + ]; + meta = with lib; { description = "A desktop application for creating diagrams"; homepage = "https://about.draw.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; - maintainers = with maintainers; [ darkonion0 ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ qyliss darkonion0 ]; + platforms = platforms.darwin ++ platforms.linux; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/blender/blender-numpy.patch b/pkgs/applications/misc/blender/blender-numpy.patch new file mode 100644 index 0000000000000..c76324846b1cc --- /dev/null +++ b/pkgs/applications/misc/blender/blender-numpy.patch @@ -0,0 +1,14 @@ +diff --git a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py +index 41dd4d03..a97f9d38 100755 +--- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py ++++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py +@@ -572,7 +572,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs): + # Try to guess which polys should be flat based on the fact that all the + # loop normals for a flat poly are = the poly's normal. + +- poly_smooths = np.empty(num_polys, dtype=np.bool) ++ poly_smooths = np.empty(num_polys, dtype=np.bool_) + + poly_normals = np.empty(num_polys * 3, dtype=np.float32) + mesh.polygons.foreach_get('normal', poly_normals) + diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index df783bdbba5bd..77ba09c23816c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation rec { hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM="; }; - patches = lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ + # remove with 3.5.X + ./blender-numpy.patch + ] ++ lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index f2b70f6654bf2..8e4c07f8d8167 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "gpxsee"; - version = "12.4"; + version = "13.0"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - hash = "sha256-/a6c30jv/sI0QbCXYCq9JrMpmZRk33lQBwbd0yjnxsQ="; + hash = "sha256-3s+LPD4KcnSWrg4JHPcbUjilwztjX8lAdQpx0h4dH0Y="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix new file mode 100644 index 0000000000000..3d1340a05728d --- /dev/null +++ b/pkgs/applications/misc/lunatask/default.nix @@ -0,0 +1,38 @@ +{ lib, appimageTools, fetchurl }: + +let + version = "1.6.4"; + pname = "lunatask"; + + src = fetchurl { + url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; + sha256 = "sha256-rvjjzVgtDNryj7GO+ZfK92nZvWRnRPFoy9hEIGjviqQ="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; + +in appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/lunatask.desktop $out/share/applications/lunatask.desktop + install -m 444 -D ${appimageContents}/lunatask.png $out/share/icons/hicolor/0x0/apps/lunatask.png + substituteInPlace $out/share/applications/lunatask.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "An all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; + longDescription = '' + Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health. + ''; + homepage = "https://lunatask.app"; + downloadPage = "https://lunatask.app/download"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ henkery ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 97a5445638ed9..7e5fa2c9fbae3 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rsClock"; - version = "0.1.4"; + version = "0.1.9"; src = fetchFromGitHub { owner = "valebes"; repo = pname; rev = "v${version}"; - sha256 = "1i93qkz6d8sbk78i4rvx099hnn4lklp4cjvanpm9ssv8na4rqvh2"; + sha256 = "sha256-HsHFlM5PHUIF8FbLMJpleAvgsXHP6IZLuiH+umK1V4M="; }; - cargoSha256 = "1vgizkdzi9mnan4rcswyv450y6a4b9l74d0siv1ix0nnlznnqyg1"; + cargoHash = "sha256-0bUKiKieIic+d3jEow887i7j2tp/ntYkXm6x08Df64M="; meta = with lib; { description = "A simple terminal clock written in Rust"; diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index 9576cb486288e..4c93daee4a36b 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -29,7 +29,7 @@ - Release updates: https://chromereleases.googleblog.com/ - Available as Atom or RSS feed (filter for "Stable Channel Update for Desktop") - - Channel overview: https://omahaproxy.appspot.com/ + - Release API: https://developer.chrome.com/docs/versionhistory/guide/ - Release schedule: https://chromiumdash.appspot.com/schedule # Updating Chromium @@ -39,6 +39,16 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). +Note: Due to the script downloading many large tarballs it might be +necessary to adjust the available tmpfs size (it defaults to 10% of the +systems memory) + +```nix +services.logind.extraConfig = '' + RuntimeDirectorySize=4G +''; +``` + Note: The source tarball is often only available a few hours after the release was announced. The CI/CD status can be tracked here: - https://ci.chromium.org/p/infra/builders/cron/publish_tarball diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 1eea3e8962f80..63465f370caa0 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -82,7 +82,7 @@ mkChromiumDerivation (base: rec { of source code for Google Chrome (which has some additional features). ''; homepage = if ungoogled - then "https://github.com/Eloston/ungoogled-chromium" + then "https://github.com/ungoogled-software/ungoogled-chromium" else "https://www.chromium.org/"; maintainers = with lib.maintainers; if ungoogled then [ squalus primeos michaeladler ] diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index a8e84dae196d4..549d2853776f9 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = rev; src = fetchFromGitHub { - owner = "Eloston"; + owner = "ungoogled-software"; repo = "ungoogled-chromium"; inherit rev sha256; }; diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 2a370a1a33b8d..380d33c12427a 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -19,7 +19,7 @@ from distutils.version import LooseVersion from os.path import abspath, dirname from urllib.request import urlopen -HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' +RELEASES_URL = 'https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/all/versions/all/releases' DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' @@ -90,20 +90,24 @@ def get_channel_dependencies(version): } -def get_latest_ungoogled_chromium_tag(): - """Returns the latest ungoogled-chromium tag using the GitHub API.""" - api_tag_url = 'https://api.github.com/repos/Eloston/ungoogled-chromium/tags?per_page=1' +def get_latest_ungoogled_chromium_tag(linux_stable_versions): + """Returns the latest ungoogled-chromium tag for linux using the GitHub API.""" + api_tag_url = 'https://api.github.com/repos/ungoogled-software/ungoogled-chromium/tags' with urlopen(api_tag_url) as http_response: - tag_data = json.load(http_response) - return tag_data[0]['name'] + tags = json.load(http_response) + for tag in tags: + if not tag['name'].split('-')[0] in linux_stable_versions: + continue + + return tag['name'] -def get_latest_ungoogled_chromium_build(): +def get_latest_ungoogled_chromium_build(linux_stable_versions): """Returns a dictionary for the latest ungoogled-chromium build.""" - tag = get_latest_ungoogled_chromium_tag() + tag = get_latest_ungoogled_chromium_tag(linux_stable_versions) version = tag.split('-')[0] return { - 'channel': 'ungoogled-chromium', + 'name': 'chrome/platforms/linux/channels/ungoogled-chromium/versions/', 'version': version, 'ungoogled_tag': tag } @@ -111,7 +115,7 @@ def get_latest_ungoogled_chromium_build(): def get_ungoogled_chromium_gn_flags(revision): """Returns ungoogled-chromium's GN build flags for the given revision.""" - gn_flags_url = f'https://raw.githubusercontent.com/Eloston/ungoogled-chromium/{revision}/flags.gn' + gn_flags_url = f'https://raw.githubusercontent.com/ungoogled-software/ungoogled-chromium/{revision}/flags.gn' return urlopen(gn_flags_url).read().decode() @@ -159,27 +163,29 @@ channels = {} last_channels = load_json(JSON_PATH) -print(f'GET {HISTORY_URL}', file=sys.stderr) -with urlopen(HISTORY_URL) as resp: - builds = csv.DictReader(iterdecode(resp, 'utf-8')) - builds = list(builds) - builds.append(get_latest_ungoogled_chromium_build()) - for build in builds: - channel_name = build['channel'] +print(f'GET {RELEASES_URL}', file=sys.stderr) +with urlopen(RELEASES_URL) as resp: + releases = json.load(resp)['releases'] + + linux_stable_versions = [release['version'] for release in releases if release['name'].startswith('chrome/platforms/linux/channels/stable/versions/')] + releases.append(get_latest_ungoogled_chromium_build(linux_stable_versions)) - # If we've already found a newer build for this channel, we're + for release in releases: + channel_name = re.findall("chrome\/platforms\/linux\/channels\/(.*)\/versions\/", release['name'])[0] + + # If we've already found a newer release for this channel, we're # no longer interested in it. if channel_name in channels: continue - # If we're back at the last build we used, we don't need to + # If we're back at the last release we used, we don't need to # keep going -- there's no new version available, and we can # just reuse the info from last time. - if build['version'] == last_channels[channel_name]['version']: + if release['version'] == last_channels[channel_name]['version']: channels[channel_name] = last_channels[channel_name] continue - channel = {'version': build['version']} + channel = {'version': release['version']} if channel_name == 'dev': google_chrome_suffix = 'unstable' elif channel_name == 'ungoogled-chromium': @@ -188,35 +194,26 @@ with urlopen(HISTORY_URL) as resp: google_chrome_suffix = channel_name try: - channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') + channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{release["version"]}.tar.xz') channel['sha256bin64'] = nix_prefetch_url( f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + - f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') + f'google-chrome-{google_chrome_suffix}_{release["version"]}-1_amd64.deb') except subprocess.CalledProcessError: - if (channel_name == 'ungoogled-chromium' and 'sha256' in channel and - build['version'].split('.')[0] == last_channels['stable']['version'].split('.')[0]): - # Sometimes ungoogled-chromium is updated to a newer tag than - # the latest stable Chromium version. In this case we'll set - # sha256bin64 to null and the Nixpkgs code will fall back to - # the latest stable Google Chrome (only required for - # Widevine/DRM which is disabled by default): - channel['sha256bin64'] = None - else: - # This build isn't actually available yet. Continue to - # the next one. - continue + # This release isn't actually available yet. Continue to + # the next one. + continue channel['deps'] = get_channel_dependencies(channel['version']) if channel_name == 'stable': channel['chromedriver'] = get_matching_chromedriver(channel['version']) elif channel_name == 'ungoogled-chromium': - ungoogled_repo_url = 'https://github.com/Eloston/ungoogled-chromium.git' + ungoogled_repo_url = 'https://github.com/ungoogled-software/ungoogled-chromium.git' channel['deps']['ungoogled-patches'] = { - 'rev': build['ungoogled_tag'], - 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] + 'rev': release['ungoogled_tag'], + 'sha256': nix_prefetch_git(ungoogled_repo_url, release['ungoogled_tag'])['sha256'] } with open(UNGOOGLED_FLAGS_PATH, 'w') as out: - out.write(get_ungoogled_chromium_gn_flags(build['ungoogled_tag'])) + out.write(get_ungoogled_chromium_gn_flags(release['ungoogled_tag'])) channels[channel_name] = channel diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 239c3548eb49e..e6edebc94d13f 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.15.8"; + version = "1.15.9"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-zfwuFa309JysFMueFbtnt/7LyCCoXKhIIiFwJY/lIZc="; + hash = "sha256-tR3qffGB83iyg3T7YRD1YRX/PG4YGLOnElHJ0ju47Y8="; }; nativeBuildInputs = [ cmake pkg-config zip ]; diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index 812cc6561a7f1..591e9b92c0bf8 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UshnNwpCGjAvEZY4+oIjSS8bqcmEcIrnm4e0IhH/8xM="; + sha256 = "sha256-1AjOJ5irfX/EqKCb8hhu5g3i6hgvet+g+IN1rm1dMQE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 31285ee707234..304ea70963cb7 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.12.4"; + version = "0.13.1"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-mz4RWKq3HNpxNl7i8wE1q2PoICUQrzTUSmyZII3GhS4="; + hash = "sha256-HSMyGA4S8VjEA2u4TbmH+qS5ZCsWBg+aTNhAbt4S6yY="; }; - vendorHash = "sha256-Nxi6sNR7bDmeTcrg7Zx7UIqLvzNY6HK5qSSdfM2snj0="; + vendorHash = "sha256-Rxm96sgdZFKuyQzT76WJHvzEM0tG2rvqnl7+umoFIMY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kubespy/default.nix b/pkgs/applications/networking/cluster/kubespy/default.nix index 0ed978a4a59e9..43c4adc555c90 100644 --- a/pkgs/applications/networking/cluster/kubespy/default.nix +++ b/pkgs/applications/networking/cluster/kubespy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubespy"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "pulumi"; repo = "kubespy"; - sha256 = "sha256-ChHrDAmPUjdyiF+XQONQMDN3UZQMM80BR+m+E8o3gnw="; + sha256 = "sha256-eSQl8K+a9YcKXE80bl25+alHoBG8T+LCYOd4Bd9QSdY="; }; - vendorSha256 = "sha256-HmMh5jrRGs4rtN9GLddS9IwITyvVmOrL5TShhQeyxKU="; + vendorHash = "sha256-brs4QIo4QoLHU95llBHN51zYcgQgN7kbMJDMy2OYOsk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d144858ab3acf..6738111315afc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -381,11 +381,11 @@ "vendorHash": "sha256-E1gzdES/YVxQq2J47E2zosvud2C/ViBeQ8+RfNHMBAg=" }, "fastly": { - "hash": "sha256-Z38tG5Of+nYuIT3IxY/hxbV0HIgkITBnaXcr3oYIf6Y=", + "hash": "sha256-o1nRKcv5SVJUOZfF2Y8H742HGhPyL6dglfqi8ZLoaHY=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v4.3.0", + "rev": "v4.3.1", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index ceeeae75a18f4..c5451b29dfcd6 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-54iNbMZ+j6ioBTb/okyWZqqe4p6IyapZwc6VdtiAkLs="; + sha256 = "sha256-g5KhJlkW32b2g2ZtpYd/52TTmCezxAT5SavvgXYEJoE="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-stpJNDC+dQQNZdZTihbQWZ66wgdQ+oz8s3Ogb1wxnxY="; + cargoHash = "sha256-SnYNp+iWqDPi2kdM3qzGIj6jsWgl0pj0x9f3gd7lbpA="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index a29a5364ce7ae..bf0dd678109dc 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -1,35 +1,24 @@ { lib -, stdenv -, fetchzip +, fetchFromGitLab , imagemagick -, autoPatchelfHook -, gtk3 -, libsecret -, jsoncpp -, wrapGAppsHook +, flutter , makeDesktopItem -, openssl -, olm }: -let - version = "1.10.0"; - # map of nix platform -> expected url platform - platformMap = { - x86_64-linux = "linux-x86"; - aarch64-linux = "linux-arm64"; - }; -in -stdenv.mkDerivation { - inherit version; - pname = "fluffychat"; +flutter.buildFlutterApplication rec { + version = "1.11.0"; + name = "fluffychat"; - src = fetchzip { - url = "https://gitlab.com/api/v4/projects/16112282/packages/generic/fluffychat/${version}/fluffychat-${platformMap.${stdenv.hostPlatform.system}}.tar.gz"; - stripRoot = false; - sha256 = "sha256-SbzTEMeJRFEUN0nZF9hL0UEzTWl1VtHVPIx/AGgQvM8="; + src = fetchFromGitLab { + owner = "famedly"; + repo = "fluffychat"; + rev = "v${version}"; + hash = "sha256-Z7BOGsirBVQxRJY4kmskCmPeZloc41/bf4/ExoO8VBk="; }; + depsListFile = ./deps.json; + vendorHash = "sha256-axByNptbzGR7GQT4Gs2yaEyUCkCbI9RQNNOHN7CYd9A="; + desktopItem = makeDesktopItem { name = "Fluffychat"; exec = "@out@/bin/fluffychat"; @@ -38,18 +27,10 @@ stdenv.mkDerivation { genericName = "Chat with your friends (matrix client)"; categories = [ "Chat" "Network" "InstantMessaging" ]; }; - buildInputs = [ gtk3 libsecret jsoncpp ]; - nativeBuildInputs = [ autoPatchelfHook wrapGAppsHook imagemagick ]; - - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - mv * $out/share - - makeWrapper "$out/share/fluffychat" "$out/bin/fluffychat" \ - --prefix "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ openssl olm ]}" + nativeBuildInputs = [ imagemagick ]; - FAV=$out/share/data/flutter_assets/assets/favicon.png + postInstall = '' + FAV=$out/app/data/flutter_assets/assets/favicon.png ICO=$out/share/icons install -D $FAV $ICO/fluffychat.png @@ -70,6 +51,6 @@ stdenv.mkDerivation { license = licenses.agpl3Plus; maintainers = with maintainers; [ mkg20001 gilice ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; + sourceProvenance = [ sourceTypes.fromSource ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json new file mode 100644 index 0000000000000..9d8e272ede6db --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json @@ -0,0 +1,3095 @@ +[ + { + "name": "fluffychat", + "version": "1.11.0+3254", + "kind": "root", + "source": "root", + "dependencies": [ + "adaptive_dialog", + "animations", + "badges", + "blurhash_dart", + "callkeep", + "chewie", + "collection", + "connectivity_plus", + "cupertino_icons", + "desktop_drop", + "desktop_lifecycle", + "desktop_notifications", + "device_info_plus", + "dynamic_color", + "emoji_picker_flutter", + "emoji_proposal", + "emojis", + "file_picker", + "flutter", + "flutter_app_badger", + "flutter_app_lock", + "flutter_blurhash", + "flutter_cache_manager", + "flutter_foreground_task", + "flutter_local_notifications", + "flutter_localizations", + "flutter_map", + "flutter_matrix_html", + "flutter_olm", + "flutter_openssl_crypto", + "flutter_ringtone_player", + "flutter_secure_storage", + "flutter_typeahead", + "flutter_web_auth_2", + "flutter_webrtc", + "future_loading_dialog", + "geolocator", + "handy_window", + "hive", + "hive_flutter", + "http", + "image_picker", + "intl", + "just_audio", + "just_audio_mpv", + "keyboard_shortcuts", + "latlong2", + "matrix", + "matrix_homeserver_recommendations", + "matrix_link_text", + "native_imaging", + "package_info_plus", + "path_provider", + "permission_handler", + "pin_code_text_field", + "provider", + "punycode", + "qr_code_scanner", + "qr_flutter", + "receive_sharing_intent", + "record", + "scroll_to_index", + "share_plus", + "shared_preferences", + "slugify", + "swipe_to_action", + "tor_detector_web", + "uni_links", + "unifiedpush", + "universal_html", + "url_launcher", + "vibration", + "video_compress", + "video_player", + "vrouter", + "wakelock", + "webrtc_interface", + "dart_code_metrics", + "flutter_lints", + "flutter_native_splash", + "flutter_test", + "import_sorter", + "integration_test", + "msix", + "translations_cleaner", + "ffi", + "flutter_secure_storage_windows", + "geolocator_android" + ] + }, + { + "name": "geolocator_android", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "geolocator_platform_interface" + ] + }, + { + "name": "geolocator_platform_interface", + "version": "2.3.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "vector_math", + "meta" + ] + }, + { + "name": "meta", + "version": "1.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "vector_math", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "flutter", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "characters", + "collection", + "js", + "material_color_utilities", + "meta", + "vector_math", + "sky_engine" + ] + }, + { + "name": "sky_engine", + "version": "0.0.99", + "kind": "transitive", + "source": "sdk", + "dependencies": [] + }, + { + "name": "material_color_utilities", + "version": "0.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "js", + "version": "0.6.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "collection", + "version": "1.17.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "characters", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_secure_storage_windows", + "version": "1.1.2", + "kind": "transitive", + "source": "git", + "dependencies": [] + }, + { + "name": "ffi", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "translations_cleaner", + "version": "0.0.5", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "glob" + ] + }, + { + "name": "glob", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path", + "version": "1.8.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "file", + "version": "6.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "async", + "version": "2.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "args", + "version": "2.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "msix", + "version": "3.7.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "flutter", + "args", + "yaml", + "path", + "package_config", + "get_it", + "image", + "pub_semver", + "console", + "cli_util" + ] + }, + { + "name": "cli_util", + "version": "0.3.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "console", + "version": "4.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math" + ] + }, + { + "name": "pub_semver", + "version": "2.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "image", + "version": "3.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "meta", + "xml" + ] + }, + { + "name": "xml", + "version": "5.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "archive", + "version": "3.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "path" + ] + }, + { + "name": "crypto", + "version": "3.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "get_it", + "version": "7.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "yaml", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "integration_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "flutter_driver", + "flutter_test", + "path", + "vm_service", + "archive", + "async", + "boolean_selector", + "characters", + "clock", + "collection", + "crypto", + "fake_async", + "file", + "js", + "matcher", + "material_color_utilities", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "sync_http", + "term_glyph", + "test_api", + "typed_data", + "vector_math", + "webdriver" + ] + }, + { + "name": "webdriver", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "matcher", + "path", + "stack_trace", + "sync_http" + ] + }, + { + "name": "sync_http", + "version": "0.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "matcher", + "version": "0.12.13", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "stack_trace" + ] + }, + { + "name": "test_api", + "version": "0.4.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph", + "matcher" + ] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "vm_service", + "version": "9.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "test_api", + "path", + "fake_async", + "clock", + "stack_trace", + "vector_math", + "async", + "boolean_selector", + "characters", + "collection", + "js", + "matcher", + "material_color_utilities", + "meta", + "source_span", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "flutter_driver", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "file", + "flutter", + "flutter_test", + "fuchsia_remote_debug_protocol", + "path", + "meta", + "vm_service", + "webdriver", + "archive", + "async", + "boolean_selector", + "characters", + "clock", + "collection", + "crypto", + "js", + "matcher", + "material_color_utilities", + "platform", + "process", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "sync_http", + "term_glyph", + "test_api", + "typed_data", + "vector_math" + ] + }, + { + "name": "process", + "version": "4.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "path", + "platform" + ] + }, + { + "name": "platform", + "version": "3.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "fuchsia_remote_debug_protocol", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "process", + "vm_service", + "file", + "meta", + "path", + "platform" + ] + }, + { + "name": "import_sorter", + "version": "4.6.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "tint", + "yaml" + ] + }, + { + "name": "tint", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_native_splash", + "version": "2.2.0+1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "flutter", + "flutter_web_plugins", + "image", + "js", + "lint", + "meta", + "path", + "universal_io", + "xml", + "yaml" + ] + }, + { + "name": "universal_io", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "typed_data" + ] + }, + { + "name": "lint", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "js", + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math" + ] + }, + { + "name": "flutter_lints", + "version": "2.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "dart_code_metrics", + "version": "4.21.3", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "analyzer_plugin", + "ansicolor", + "args", + "collection", + "crypto", + "file", + "glob", + "html", + "meta", + "path", + "platform", + "pub_updater", + "source_span", + "xml", + "yaml" + ] + }, + { + "name": "pub_updater", + "version": "0.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "http", + "json_annotation", + "process" + ] + }, + { + "name": "json_annotation", + "version": "4.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "http", + "version": "0.13.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta", + "path" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "html", + "version": "0.15.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "csslib", + "source_span" + ] + }, + { + "name": "csslib", + "version": "0.17.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "ansicolor", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "analyzer_plugin", + "version": "0.11.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "collection", + "dart_style", + "pub_semver", + "yaml" + ] + }, + { + "name": "dart_style", + "version": "2.2.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "analyzer", + "version": "5.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "watcher", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "49.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "webrtc_interface", + "version": "1.0.11", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "wakelock", + "version": "0.6.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "wakelock_macos", + "wakelock_platform_interface", + "wakelock_web", + "wakelock_windows" + ] + }, + { + "name": "wakelock_windows", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "wakelock_platform_interface", + "win32" + ] + }, + { + "name": "win32", + "version": "3.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "wakelock_platform_interface", + "version": "0.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta" + ] + }, + { + "name": "wakelock_web", + "version": "0.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "js", + "wakelock_platform_interface" + ] + }, + { + "name": "wakelock_macos", + "version": "0.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "wakelock_platform_interface" + ] + }, + { + "name": "vrouter", + "version": "1.2.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_strategy", + "url_launcher", + "move_to_background" + ] + }, + { + "name": "move_to_background", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "url_launcher", + "version": "6.1.10", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_macos", + "version": "3.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_linux", + "version": "3.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_ios", + "version": "6.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_android", + "version": "6.0.25", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_strategy", + "version": "0.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter_web_plugins" + ] + }, + { + "name": "video_player", + "version": "2.6.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "html", + "video_player_android", + "video_player_avfoundation", + "video_player_platform_interface", + "video_player_web" + ] + }, + { + "name": "video_player_web", + "version": "2.0.15", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_platform_interface", + "version": "6.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "video_player_avfoundation", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_android", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_compress", + "version": "3.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "vibration", + "version": "1.7.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "universal_html", + "version": "2.2.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "csslib", + "charcode", + "collection", + "html", + "meta", + "source_span", + "typed_data", + "universal_io" + ] + }, + { + "name": "charcode", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "unifiedpush", + "version": "4.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences", + "unifiedpush_platform_interface", + "unifiedpush_android" + ] + }, + { + "name": "unifiedpush_android", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences", + "unifiedpush_platform_interface" + ] + }, + { + "name": "unifiedpush_platform_interface", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "shared_preferences", + "version": "2.0.15", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_android", + "shared_preferences_ios", + "shared_preferences_linux", + "shared_preferences_macos", + "shared_preferences_platform_interface", + "shared_preferences_web", + "shared_preferences_windows" + ] + }, + { + "name": "shared_preferences_windows", + "version": "2.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_platform_interface", + "path_provider_windows", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_platform_interface", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "path_provider_windows", + "version": "2.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "path_provider_platform_interface", + "version": "2.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "shared_preferences_web", + "version": "2.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_macos", + "version": "2.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_linux", + "version": "2.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_linux", + "path_provider_platform_interface", + "shared_preferences_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.1.10", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "0.2.0+3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "process" + ] + }, + { + "name": "shared_preferences_ios", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_android", + "version": "2.0.17", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "uni_links", + "version": "0.5.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "uni_links_platform_interface", + "uni_links_web" + ] + }, + { + "name": "uni_links_web", + "version": "0.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "uni_links_platform_interface" + ] + }, + { + "name": "uni_links_platform_interface", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "tor_detector_web", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "js" + ] + }, + { + "name": "swipe_to_action", + "version": "0.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins" + ] + }, + { + "name": "slugify", + "version": "2.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "share_plus", + "version": "6.3.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "cross_file", + "meta", + "mime", + "flutter", + "flutter_web_plugins", + "share_plus_platform_interface", + "file", + "url_launcher_web", + "url_launcher_windows", + "url_launcher_linux", + "url_launcher_platform_interface", + "ffi", + "win32" + ] + }, + { + "name": "share_plus_platform_interface", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "flutter", + "meta", + "mime", + "plugin_platform_interface", + "path_provider", + "uuid" + ] + }, + { + "name": "uuid", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { + "name": "path_provider", + "version": "2.0.13", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.0.24", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "cross_file", + "version": "0.3.3+4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "js", + "meta" + ] + }, + { + "name": "scroll_to_index", + "version": "3.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "record", + "version": "4.4.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "record_platform_interface", + "record_web", + "record_windows", + "record_macos", + "record_linux" + ] + }, + { + "name": "record_linux", + "version": "0.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "record_platform_interface", + "path" + ] + }, + { + "name": "record_platform_interface", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "record_macos", + "version": "0.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "record_platform_interface" + ] + }, + { + "name": "record_windows", + "version": "0.7.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "record_platform_interface", + "path" + ] + }, + { + "name": "record_web", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "record_platform_interface" + ] + }, + { + "name": "receive_sharing_intent", + "version": "1.4.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "qr_flutter", + "version": "4.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "qr" + ] + }, + { + "name": "qr", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "qr_code_scanner", + "version": "1.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "js", + "flutter", + "flutter_web_plugins" + ] + }, + { + "name": "punycode", + "version": "1.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "provider", + "version": "6.0.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "nested" + ] + }, + { + "name": "nested", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "pin_code_text_field", + "version": "1.8.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "permission_handler", + "version": "10.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "permission_handler_android", + "permission_handler_apple", + "permission_handler_windows", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_platform_interface", + "version": "3.9.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "permission_handler_windows", + "version": "0.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_apple", + "version": "9.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_android", + "version": "10.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "package_info_plus", + "version": "1.4.3+1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "package_info_plus_platform_interface", + "package_info_plus_linux", + "package_info_plus_macos", + "package_info_plus_windows", + "package_info_plus_web" + ] + }, + { + "name": "package_info_plus_web", + "version": "1.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "http", + "meta", + "package_info_plus_platform_interface" + ] + }, + { + "name": "package_info_plus_platform_interface", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "package_info_plus_windows", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "package_info_plus_platform_interface", + "ffi", + "flutter", + "win32" + ] + }, + { + "name": "package_info_plus_macos", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "package_info_plus_linux", + "version": "1.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "package_info_plus_platform_interface", + "flutter", + "path" + ] + }, + { + "name": "native_imaging", + "version": "0.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "js", + "ffi" + ] + }, + { + "name": "matrix_link_text", + "version": "1.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher" + ] + }, + { + "name": "matrix_homeserver_recommendations", + "version": "0.3.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "matrix_api_lite" + ] + }, + { + "name": "matrix_api_lite", + "version": "1.1.10", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "enhanced_enum", + "http", + "mime" + ] + }, + { + "name": "enhanced_enum", + "version": "0.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "matrix", + "version": "0.18.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "base58check", + "blurhash_dart", + "canonical_json", + "collection", + "crypto", + "ffi", + "hive", + "html", + "html_unescape", + "http", + "image", + "js", + "markdown", + "matrix_api_lite", + "mime", + "olm", + "random_string", + "sdp_transform", + "slugify", + "webrtc_interface" + ] + }, + { + "name": "sdp_transform", + "version": "0.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "random_string", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "olm", + "version": "2.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "js", + "ffi" + ] + }, + { + "name": "markdown", + "version": "4.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "charcode", + "meta" + ] + }, + { + "name": "html_unescape", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "hive", + "version": "2.2.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta", + "crypto" + ] + }, + { + "name": "canonical_json", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data", + "unorm_dart" + ] + }, + { + "name": "unorm_dart", + "version": "0.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "blurhash_dart", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "image" + ] + }, + { + "name": "base58check", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "collection" + ] + }, + { + "name": "latlong2", + "version": "0.8.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "intl" + ] + }, + { + "name": "intl", + "version": "0.17.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "path" + ] + }, + { + "name": "keyboard_shortcuts", + "version": "0.1.4", + "kind": "direct", + "source": "git", + "dependencies": [ + "flutter", + "visibility_detector", + "tuple", + "collection" + ] + }, + { + "name": "tuple", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "visibility_detector", + "version": "0.3.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "just_audio_mpv", + "version": "0.1.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "just_audio_platform_interface", + "mpv_dart" + ] + }, + { + "name": "mpv_dart", + "version": "0.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "eventify", + "path" + ] + }, + { + "name": "eventify", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "just_audio_platform_interface", + "version": "4.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "just_audio", + "version": "0.9.31", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "just_audio_platform_interface", + "just_audio_web", + "audio_session", + "rxdart", + "path", + "path_provider", + "async", + "uuid", + "crypto", + "meta", + "flutter" + ] + }, + { + "name": "rxdart", + "version": "0.27.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "audio_session", + "version": "0.1.13", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "rxdart", + "meta" + ] + }, + { + "name": "just_audio_web", + "version": "0.4.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "just_audio_platform_interface", + "flutter", + "flutter_web_plugins" + ] + }, + { + "name": "image_picker", + "version": "0.8.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "image_picker_android", + "image_picker_for_web", + "image_picker_ios", + "image_picker_platform_interface" + ] + }, + { + "name": "image_picker_platform_interface", + "version": "2.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "flutter", + "http", + "plugin_platform_interface" + ] + }, + { + "name": "image_picker_ios", + "version": "0.8.7+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "image_picker_for_web", + "version": "2.1.12", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "image_picker_platform_interface" + ] + }, + { + "name": "image_picker_android", + "version": "0.8.6+5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_plugin_android_lifecycle", + "image_picker_platform_interface" + ] + }, + { + "name": "flutter_plugin_android_lifecycle", + "version": "2.0.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "hive_flutter", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "hive", + "path_provider", + "path" + ] + }, + { + "name": "handy_window", + "version": "0.1.9", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "geolocator", + "version": "7.7.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "geolocator_platform_interface", + "geolocator_android", + "geolocator_apple", + "geolocator_web" + ] + }, + { + "name": "geolocator_web", + "version": "2.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "geolocator_platform_interface" + ] + }, + { + "name": "geolocator_apple", + "version": "1.2.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "geolocator_platform_interface" + ] + }, + { + "name": "future_loading_dialog", + "version": "0.2.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_webrtc", + "version": "0.9.24", + "kind": "direct", + "source": "git", + "dependencies": [ + "dart_webrtc", + "flutter", + "path_provider", + "webrtc_interface" + ] + }, + { + "name": "dart_webrtc", + "version": "1.0.15", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "js", + "platform_detect", + "webrtc_interface" + ] + }, + { + "name": "platform_detect", + "version": "2.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "pub_semver" + ] + }, + { + "name": "flutter_web_auth_2", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_auth_2_platform_interface", + "flutter_web_plugins", + "url_launcher", + "window_to_front" + ] + }, + { + "name": "window_to_front", + "version": "0.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_web_auth_2_platform_interface", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "flutter_typeahead", + "version": "4.3.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_keyboard_visibility" + ] + }, + { + "name": "flutter_keyboard_visibility", + "version": "5.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "flutter_keyboard_visibility_platform_interface", + "flutter_keyboard_visibility_linux", + "flutter_keyboard_visibility_macos", + "flutter_keyboard_visibility_web", + "flutter_keyboard_visibility_windows", + "flutter" + ] + }, + { + "name": "flutter_keyboard_visibility_windows", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter_keyboard_visibility_platform_interface", + "flutter" + ] + }, + { + "name": "flutter_keyboard_visibility_platform_interface", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "flutter_keyboard_visibility_web", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter_keyboard_visibility_platform_interface", + "flutter_web_plugins", + "flutter" + ] + }, + { + "name": "flutter_keyboard_visibility_macos", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter_keyboard_visibility_platform_interface", + "flutter" + ] + }, + { + "name": "flutter_keyboard_visibility_linux", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter_keyboard_visibility_platform_interface", + "flutter" + ] + }, + { + "name": "flutter_secure_storage", + "version": "7.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_secure_storage_linux", + "flutter_secure_storage_macos", + "flutter_secure_storage_platform_interface", + "flutter_secure_storage_web", + "flutter_secure_storage_windows", + "meta" + ] + }, + { + "name": "flutter_secure_storage_web", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_secure_storage_platform_interface", + "flutter_web_plugins", + "js" + ] + }, + { + "name": "flutter_secure_storage_platform_interface", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "flutter_secure_storage_macos", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_secure_storage_platform_interface" + ] + }, + { + "name": "flutter_secure_storage_linux", + "version": "1.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_secure_storage_platform_interface" + ] + }, + { + "name": "flutter_ringtone_player", + "version": "3.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider" + ] + }, + { + "name": "flutter_openssl_crypto", + "version": "0.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_olm", + "version": "1.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_matrix_html", + "version": "1.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "html", + "flutter", + "cached_network_image", + "matrix_link_text", + "flutter_math_fork", + "flutter_highlight", + "isolate", + "highlight", + "crypto", + "csslib" + ] + }, + { + "name": "highlight", + "version": "0.7.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "isolate", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_highlight", + "version": "0.7.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "highlight" + ] + }, + { + "name": "flutter_math_fork", + "version": "0.4.2+2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_svg", + "provider", + "meta", + "collection", + "tuple" + ] + }, + { + "name": "flutter_svg", + "version": "0.22.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "path_drawing", + "vector_math", + "xml" + ] + }, + { + "name": "path_drawing", + "version": "0.5.1+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math", + "meta", + "path_parsing", + "flutter" + ] + }, + { + "name": "path_parsing", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "vector_math", + "meta" + ] + }, + { + "name": "cached_network_image", + "version": "3.2.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_cache_manager", + "octo_image", + "cached_network_image_platform_interface", + "cached_network_image_web" + ] + }, + { + "name": "cached_network_image_web", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_cache_manager", + "cached_network_image_platform_interface" + ] + }, + { + "name": "cached_network_image_platform_interface", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_cache_manager" + ] + }, + { + "name": "flutter_cache_manager", + "version": "3.3.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "collection", + "file", + "flutter", + "http", + "path", + "path_provider", + "pedantic", + "rxdart", + "sqflite", + "uuid" + ] + }, + { + "name": "sqflite", + "version": "2.2.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "sqflite_common", + "path" + ] + }, + { + "name": "sqflite_common", + "version": "2.4.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "synchronized", + "path", + "meta" + ] + }, + { + "name": "synchronized", + "version": "3.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "pedantic", + "version": "1.11.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "octo_image", + "version": "1.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_blurhash" + ] + }, + { + "name": "flutter_blurhash", + "version": "0.7.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_map", + "version": "3.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "flutter", + "http", + "latlong2", + "meta", + "polylabel", + "positioned_tap_detector_2", + "proj4dart", + "tuple", + "vector_math" + ] + }, + { + "name": "proj4dart", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "mgrs_dart", + "wkt_parser", + "meta" + ] + }, + { + "name": "wkt_parser", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "mgrs_dart", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "unicode" + ] + }, + { + "name": "unicode", + "version": "0.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "lists" + ] + }, + { + "name": "lists", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "positioned_tap_detector_2", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "polylabel", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "flutter_localizations", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "flutter", + "intl", + "characters", + "clock", + "collection", + "js", + "material_color_utilities", + "meta", + "path", + "vector_math" + ] + }, + { + "name": "flutter_local_notifications", + "version": "12.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "flutter", + "flutter_local_notifications_linux", + "flutter_local_notifications_platform_interface", + "timezone" + ] + }, + { + "name": "timezone", + "version": "0.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "flutter_local_notifications_platform_interface", + "version": "6.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "flutter_local_notifications_linux", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_local_notifications_platform_interface", + "dbus", + "path", + "xdg_directories" + ] + }, + { + "name": "dbus", + "version": "0.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "ffi", + "meta", + "xml" + ] + }, + { + "name": "flutter_foreground_task", + "version": "3.10.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "platform", + "shared_preferences", + "shared_preferences_android", + "shared_preferences_ios" + ] + }, + { + "name": "flutter_app_lock", + "version": "3.0.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "flutter_app_badger", + "version": "1.5.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "file_picker", + "version": "5.2.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "flutter_plugin_android_lifecycle", + "plugin_platform_interface", + "ffi", + "path", + "win32" + ] + }, + { + "name": "emojis", + "version": "0.9.9", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "emoji_proposal", + "version": "0.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "emojis", + "sentiment_dart" + ] + }, + { + "name": "sentiment_dart", + "version": "0.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "remove_emoji" + ] + }, + { + "name": "remove_emoji", + "version": "0.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "emoji_picker_flutter", + "version": "1.5.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "plugin_platform_interface", + "shared_preferences" + ] + }, + { + "name": "dynamic_color", + "version": "1.6.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_test", + "material_color_utilities" + ] + }, + { + "name": "device_info_plus", + "version": "8.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "device_info_plus_platform_interface", + "ffi", + "file", + "flutter", + "flutter_web_plugins", + "meta", + "win32" + ] + }, + { + "name": "device_info_plus_platform_interface", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "desktop_notifications", + "version": "0.6.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "dbus" + ] + }, + { + "name": "desktop_lifecycle", + "version": "0.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "desktop_drop", + "version": "0.4.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "cross_file" + ] + }, + { + "name": "cupertino_icons", + "version": "1.0.5", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "connectivity_plus", + "version": "3.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "connectivity_plus_platform_interface", + "js", + "meta", + "nm" + ] + }, + { + "name": "nm", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "dbus" + ] + }, + { + "name": "connectivity_plus_platform_interface", + "version": "1.2.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "chewie", + "version": "1.4.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "cupertino_icons", + "flutter", + "provider", + "video_player", + "wakelock" + ] + }, + { + "name": "callkeep", + "version": "0.3.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "badges", + "version": "2.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "animations", + "version": "2.0.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "adaptive_dialog", + "version": "1.8.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "animations", + "collection", + "dynamic_color", + "flutter", + "intersperse", + "macos_ui", + "meta" + ] + }, + { + "name": "macos_ui", + "version": "1.12.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "intersperse", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + } +] diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 20c8115a379f7..69de92e4396e8 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.18.6"; + version = "0.18.7"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-k0cQ82RVzIdru0YOd7GvzFQ+DUciTALQg876thqEoeU="; + hash = "sha256-XnBz5dUBu6VqxLFsBXOvdLu/LsrfyEp9MLR/+nNggBk="; }; - vendorHash = "sha256-hJg2TlLMDNN0FreWXNYiCIvTscgPy4ZDlntcPeIcl6U="; + vendorHash = "sha256-a2ecHdxX82/JScRPGKpgEtrISD7qkPoZyv9kvO6SzaQ="; inherit subPackages; diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 78943457d3b25..6b15073675f73 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sfUcBSUYf/+neBAhEd5LAtMOfIbdXM/ieUOztjk8Pwg="; + sha256 = "sha256-SGDORHX+lk6PS5/sPAmKZLfZD99/A7XvDPDnuAygDAM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index be92ac0a29d49..f4722b894aaab 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-QYldwxQYod5qkNC3soiKoCLDFR4UaLxdGkVufn1JIeE="; + hash = "sha256-EmpWJWvYxyg6m08Q77kRehtcVSQOm16ZdcmZWncLch4="; }; - cargoHash = "sha256-jwDJb9Hl0PegCufmaj1Q3h5itgt26E4dwmcyCxZ+4FM="; + cargoHash = "sha256-ECTvfS09CglAavj8LJbfpxnaWQtsp4DZb7GMJHIeEAA="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/applications/version-management/git-extras/default.nix index 937a771b1e42e..42b30b4867b47 100644 --- a/pkgs/applications/version-management/git-extras/default.nix +++ b/pkgs/applications/version-management/git-extras/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.5.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "tj"; repo = "git-extras"; rev = version; - sha256 = "sha256-7VNkIFjz4stRT48a9uXks84W7/tP3p7esMJKnIe1O+8="; + sha256 = "sha256-BoTMaM/6F/vXn9y80baYnP9z0PwgnJrk9inYt0JIb+Q="; }; postPatch = '' diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index 9a466c45f1e04..09a009cd66507 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -44,11 +44,11 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ - "getrandom 0.2.9", + "cfg-if 1.0.0", "once_cell", "version_check", ] @@ -63,6 +63,15 @@ dependencies = [ ] [[package]] +name = "aho-corasick" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +dependencies = [ + "memchr", +] + +[[package]] name = "alloc-no-stdlib" version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -117,6 +126,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" + +[[package]] name = "assert-json-diff" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -280,7 +301,7 @@ dependencies = [ "configloader", "eagerepo", "edenapi", - "env_logger 0.7.1", + "env_logger 0.10.0", "identity", "libc", "log", @@ -472,6 +493,21 @@ dependencies = [ ] [[package]] +name = "blake3" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if 1.0.0", + "constant_time_eq", + "digest 0.10.6", + "rayon", +] + +[[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -531,9 +567,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "byteorder" @@ -705,9 +741,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", @@ -718,16 +754,16 @@ dependencies = [ "regex", "strsim 0.10.0", "termcolor", - "terminal_size 0.2.6", + "terminal_size", "textwrap 0.16.0", "unicase", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck 0.4.1", "proc-macro-error", @@ -814,12 +850,12 @@ dependencies = [ [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "quote", ] @@ -847,9 +883,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "4.1.1" +version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11e95a3e867422fd8d04049041f5671f94d53c32a9dcd82e2be268714942f3f3" +checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" dependencies = [ "crossterm", "strum", @@ -1027,6 +1063,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" [[package]] +name = "constant_time_eq" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" + +[[package]] name = "control-point" version = "0.1.0" dependencies = [ @@ -1053,7 +1095,9 @@ dependencies = [ "pathmatcher", "storemodel", "thiserror", + "tokio", "tracing", + "tracing-test", "types", ] @@ -1075,9 +1119,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -1330,15 +1374,15 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.20.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" dependencies = [ "bitflags", "crossterm_winapi", "libc", - "mio 0.7.14", - "parking_lot 0.11.2", + "mio", + "parking_lot 0.12.1", "signal-hook 0.3.15", "signal-hook-mio", "winapi 0.3.9", @@ -1346,9 +1390,9 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" +checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" dependencies = [ "winapi 0.3.9", ] @@ -1621,6 +1665,7 @@ checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer 0.10.4", "crypto-common", + "subtle", ] [[package]] @@ -1875,25 +1920,25 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ - "atty", - "humantime 1.3.0", "log", "regex", - "termcolor", ] [[package]] name = "env_logger" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ + "humantime", + "is-terminal", "log", "regex", + "termcolor", ] [[package]] @@ -1990,7 +2035,7 @@ dependencies = [ [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#55c736fe6b9f42458d39211ae236cc59412c8424" +source = "git+https://github.com/facebook/fb303.git?branch=main#fb3d4f9157df56cd59c607129e51732b790f2361" dependencies = [ "anyhow", "async-trait", @@ -2011,7 +2056,7 @@ dependencies = [ [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "fbinit_macros", "quickcheck", @@ -2020,7 +2065,7 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "proc-macro2", "quote", @@ -2030,7 +2075,7 @@ dependencies = [ [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#1e7f13644729f1f71434fa06395267db723ad4e0" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#0d92a2e3f9853f4d0362e0662687bca1d134715e" dependencies = [ "anyhow", "async-trait", @@ -2050,7 +2095,7 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "byteorder", "bytes 1.4.0", @@ -2060,7 +2105,7 @@ dependencies = [ [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "anyhow", "bytes 1.4.0", @@ -2077,7 +2122,7 @@ dependencies = [ [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "tokio", ] @@ -2454,7 +2499,7 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "bstr", "fnv", "log", @@ -2463,9 +2508,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes 1.4.0", "fnv", @@ -2476,7 +2521,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", "tracing", ] @@ -2500,8 +2545,14 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", ] [[package]] @@ -2625,9 +2676,11 @@ dependencies = [ "pytracing", "rand 0.8.5", "repo", + "repo_name", "revisionstore", "revsets", "runlog", + "sampling", "serde", "serde_json", "status", @@ -2712,13 +2765,13 @@ name = "hgtime" version = "0.1.0" dependencies = [ "chrono", - "humantime 2.1.0", + "humantime", ] [[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "lazy_static", ] @@ -2726,7 +2779,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2776,7 +2829,7 @@ dependencies = [ "crossbeam 0.8.2", "curl", "curl-sys", - "env_logger 0.7.1", + "env_logger 0.10.0", "futures 0.3.28", "http", "lru-cache", @@ -2814,15 +2867,6 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - -[[package]] -name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" @@ -3017,7 +3061,7 @@ dependencies = [ "parking_lot 0.11.2", "pipe", "streampager", - "terminal_size 0.1.17", + "terminal_size", "termwiz", ] @@ -3048,6 +3092,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" [[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] name = "itertools" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3136,9 +3192,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.141" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libgit2-sys" @@ -3180,9 +3236,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" dependencies = [ "cc", "libc", @@ -3216,9 +3272,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" [[package]] name = "local-encoding" @@ -3253,11 +3309,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.8" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -3515,19 +3571,6 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "mio" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" @@ -3539,20 +3582,11 @@ dependencies = [ ] [[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] name = "mkscratch" version = "0.1.0" dependencies = [ "anyhow", - "clap 3.2.23", + "clap 3.2.25", "dirs 2.0.2", "hex", "identity", @@ -3696,9 +3730,9 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.2" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" dependencies = [ "memchr", "version_check", @@ -3722,15 +3756,6 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] name = "nu-ansi-term" version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3829,9 +3854,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.50" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3861,9 +3886,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.85" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ "cc", "libc", @@ -3883,9 +3908,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a384337e997e6860ffbaa83708b2ef329fd8c54cb67a5f64d421e0f943254f" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ "num-traits", ] @@ -4014,7 +4039,7 @@ dependencies = [ "ignore", "parking_lot 0.11.2", "regex-automata", - "regex-syntax", + "regex-syntax 0.6.29", "tempfile", "thiserror", "types", @@ -4040,9 +4065,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1403e8401ad5dedea73c626b99758535b342502f8d1e361f4a2dd952749122" +checksum = "e68e84bfb01f0507134eac1e9b410a12ba379d064eab48c50ba4ce329a527b70" dependencies = [ "thiserror", "ucd-trie", @@ -4050,9 +4075,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be99c4c1d2fc2769b1d00239431d711d08f6efedcecb8b6e30707160aee99c15" +checksum = "6b79d4c71c865a25a4322296122e3924d30bc8ee0834c8bfc8b95f7f054afbfb" dependencies = [ "pest", "pest_generator", @@ -4060,9 +4085,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56094789873daa36164de2e822b3888c6ae4b4f9da555a1103587658c805b1e" +checksum = "6c435bf1076437b851ebc8edc3a18442796b30f1728ffea6262d59bbe28b077e" dependencies = [ "pest", "pest_meta", @@ -4073,9 +4098,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.7" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6733073c7cff3d8459fda0e42f13a047870242aed8b509fe98000928975f359e" +checksum = "745a452f8eb71e39ffd8ee32b3c5f51d03845f99786fa9b68db6ff509c505411" dependencies = [ "once_cell", "pest", @@ -4247,9 +4272,9 @@ dependencies = [ [[package]] name = "polling" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags", @@ -4593,6 +4618,7 @@ name = "pyerror" version = "0.1.0" dependencies = [ "auth", + "configmodel", "cpython", "cpython_ext", "dag", @@ -4613,6 +4639,7 @@ dependencies = [ name = "pyexchange" version = "0.1.0" dependencies = [ + "configmodel", "cpython", "cpython_ext", "exchange", @@ -4657,6 +4684,7 @@ dependencies = [ "cpython", "cpython_ext", "hg-metrics", + "sampling", ] [[package]] @@ -5045,12 +5073,6 @@ dependencies = [ ] [[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] name = "quickcheck" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5064,7 +5086,7 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "proc-macro2", "quickcheck", @@ -5291,13 +5313,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.1", "memchr", - "regex-syntax", + "regex-syntax 0.7.1", ] [[package]] @@ -5306,7 +5328,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] @@ -5316,6 +5338,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] +name = "regex-syntax" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" + +[[package]] name = "remove_dir_all" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5393,9 +5421,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "base64 0.21.0", "bytes 1.4.0", @@ -5426,7 +5454,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.7", + "tokio-util 0.7.8", "tower-service", "url", "wasm-bindgen", @@ -5463,6 +5491,7 @@ dependencies = [ "auth", "bincode", "blake2", + "blake3", "byteorder", "configmodel", "crossbeam 0.8.2", @@ -5496,6 +5525,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "regex", + "repo_name", "revisionstore_types", "serde", "serde_derive", @@ -5608,9 +5638,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc_version" @@ -5623,9 +5653,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece" dependencies = [ "bitflags", "errno", @@ -5669,6 +5699,12 @@ dependencies = [ ] [[package]] +name = "rustversion" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" + +[[package]] name = "ryu" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5690,6 +5726,16 @@ dependencies = [ ] [[package]] +name = "sampling" +version = "0.1.0" +dependencies = [ + "configmodel", + "once_cell", + "parking_lot 0.11.2", + "tracing", +] + +[[package]] name = "schannel" version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5705,7 +5751,7 @@ dependencies = [ "anyhow", "clap 2.34.0", "commitcloudsubscriber", - "env_logger 0.7.1", + "env_logger 0.10.0", "libc", "log", "serde", @@ -5799,7 +5845,7 @@ version = "0.1.0" [[package]] name = "serde_bser" version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#efc891b9f64a7b560b9e06f62fb8767343501729" +source = "git+https://github.com/facebook/watchman.git?branch=main#c5a3b469fa068e6d9e142a18190100ee4fbe089c" dependencies = [ "anyhow", "byteorder", @@ -5966,7 +6012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.7.14", + "mio", "signal-hook 0.3.15", ] @@ -6040,7 +6086,7 @@ dependencies = [ [[package]] name = "sorted_vector_map" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "itertools 0.10.5", "quickcheck", @@ -6193,27 +6239,28 @@ dependencies = [ [[package]] name = "strum" -version = "0.21.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" [[package]] name = "strum_macros" -version = "0.21.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.3.3", + "heck 0.4.1", "proc-macro2", "quote", + "rustversion", "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "sval" @@ -6289,16 +6336,6 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "terminal_size" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" @@ -6315,7 +6352,7 @@ checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" dependencies = [ "dirs 4.0.0", "fnv", - "nom 5.1.2", + "nom 5.1.3", "phf 0.11.1", "phf_codegen", ] @@ -6373,7 +6410,7 @@ dependencies = [ "nix 0.24.3", "num-derive", "num-traits", - "ordered-float 3.6.0", + "ordered-float 3.7.0", "pest", "pest_derive", "phf 0.10.1", @@ -6409,7 +6446,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ - "terminal_size 0.2.6", + "terminal_size", "unicode-width", ] @@ -6483,7 +6520,7 @@ dependencies = [ [[package]] name = "thrift_compiler" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "anyhow", "clap 2.34.0", @@ -6557,14 +6594,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes 1.4.0", "libc", - "mio 0.8.6", + "mio", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", @@ -6572,7 +6609,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -6588,9 +6625,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", @@ -6620,14 +6657,14 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.7", + "tokio-util 0.7.8", ] [[package]] @@ -6650,7 +6687,7 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#c5c0563e8ff9946a116b19e92607288bebc071bc" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#ac3b1a5b49f546ae4efc3df4b4ed91bea9df6033" dependencies = [ "async-io", "futures 0.3.28", @@ -6677,9 +6714,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes 1.4.0", "futures-core", @@ -6726,11 +6763,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "cf9cf6a813d3f40c88b0b6b6f29a5c95c6cdbf97c1f9cc53fb820200f5ad814d" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -6747,13 +6783,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -6827,9 +6863,8 @@ dependencies = [ name = "tracing-sampler" version = "0.1.0" dependencies = [ - "configmodel", "once_cell", - "parking_lot 0.11.2", + "sampling", "serde", "serde_json", "tempfile", @@ -6850,9 +6885,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -6872,6 +6907,29 @@ dependencies = [ ] [[package]] +name = "tracing-test" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" +dependencies = [ + "lazy_static", + "tracing-core", + "tracing-subscriber", + "tracing-test-macro", +] + +[[package]] +name = "tracing-test-macro" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" +dependencies = [ + "lazy_static", + "quote", + "syn 1.0.109", +] + +[[package]] name = "treestate" version = "0.1.0" dependencies = [ @@ -7290,7 +7348,7 @@ dependencies = [ [[package]] name = "watchman_client" version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#efc891b9f64a7b560b9e06f62fb8767343501729" +source = "git+https://github.com/facebook/watchman.git?branch=main#c5a3b469fa068e6d9e142a18190100ee4fbe089c" dependencies = [ "anyhow", "bytes 1.4.0", @@ -7362,7 +7420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" dependencies = [ "log", - "ordered-float 3.6.0", + "ordered-float 3.7.0", "strsim 0.10.0", "thiserror", "wezterm-dynamic-derive", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 825394c38fc8b..b17b524454557 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -43,7 +43,7 @@ let owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-rZLLRcZNeYP7yKAgBujqEJ9TwwDPAct060pZ4aj/7PM="; + hash = "sha256-r15qzyMoZDCkSnYp69bOR2wuweIcbDc7F3FibBVE/qM="; }; addonsSrc = "${src}/addons"; @@ -101,10 +101,10 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-54XxXSeGoS0j0+dDUC15xn1Hvpvl2T7NJ0dZ6/ZSd9s="; - "fb303_core-0.0.0" = "sha256-YVPObJaxb5Giu3s70YP5syRSCmtijUK6y9g3UOzgrQU="; - "fbthrift-0.0.1+unstable" = "sha256-sfn8EB1hbJGq/jFjgCrf9OyBpXmIBv5qlIsiao071Os="; - "serde_bser-0.3.1" = "sha256-mrY6K6hoRo4exyZlStEIh8vuQdzd8XGkaR1MCEgKIP8="; + "cloned-0.1.0" = "sha256-bgI2/Sb+jKylPt5OqhfzcWGh1N8S0zFk/yYOwv461Io="; + "fb303_core-0.0.0" = "sha256-Rd42P2PPPgk9ohg45Lq067KcJBJ3Bw3IroYsH0YNh6s="; + "fbthrift-0.0.1+unstable" = "sha256-/d8EJoPlSHRlkE7/d5OEy2/SEmPQyS6eUInbm/zYWH8="; + "serde_bser-0.3.1" = "sha256-tfkIGQKi+eRnBUYEmoc3m+mb93tFdh/g5FPUAXYRMVM="; }; }; postPatch = '' diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index 78e4b81adb465..12208831d04f8 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -73,6 +73,6 @@ "url": "https://files.pythonhosted.org/packages/4c/76/1e41fbb365ad20b6efab2e61b0f4751518444c953b390f9b2d36cf97eea0/Cython-0.29.32.tar.gz" } ], - "version": "0.2.20230330-193452-h69692651", - "versionHash": "16853369111871393994" + "version": "0.2.20230426-145232+7ea1f245", + "versionHash": "7478665112005955779" } diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 7c403c6740c98..aca92795a1d72 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.30.7"; + version = "0.31.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mxkwAKfra2btUa/l3TjJac68SmzyGwjmz4HD2yN/U8U="; + hash = "sha256-xOwzNQGoa5rOEZnIt8738aGTHSWvgzN17TSc3hi+fcE="; }; - cargoHash = "sha256-jJ9JrpEJyk3Cg7YCZadESR0+9vB+ZdTQhG2affoCdx4="; + cargoHash = "sha256-rZmqyIe/FUIard35NFr5W/18t1auSYdAV54dlEprnm8="; nativeBuildInputs = [ pkg-config makeWrapper ]; 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 a1027c752ddd3..3c838df593031 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.7.2"; + version = "2.7.3"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-yp8NpBVgqEv34qmDMKPdy53awgSLtYfeaw1JrxENFps="; + sha256 = "sha256-F2mp3b1HBvI2lvwGzuE9QsqotLWgsP0NRyORrTV9FJs="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/flutter/package-overrides/default.nix b/pkgs/development/compilers/flutter/package-overrides/default.nix index 4a3fcd1cded04..c162929e336a5 100644 --- a/pkgs/development/compilers/flutter/package-overrides/default.nix +++ b/pkgs/development/compilers/flutter/package-overrides/default.nix @@ -1,4 +1,8 @@ { callPackage }: { + flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { }; + handy_window = callPackage ./handy-window { }; + matrix = callPackage ./matrix { }; + olm = callPackage ./olm { }; } diff --git a/pkgs/development/compilers/flutter/package-overrides/flutter-secure-storage-linux/default.nix b/pkgs/development/compilers/flutter/package-overrides/flutter-secure-storage-linux/default.nix new file mode 100644 index 0000000000000..91a61cb6c603f --- /dev/null +++ b/pkgs/development/compilers/flutter/package-overrides/flutter-secure-storage-linux/default.nix @@ -0,0 +1,17 @@ +{ lib +, pkg-config +, libsecret +, jsoncpp +}: + +{ ... }: + +{ nativeBuildInputs ? [ ] +, buildInputs ? [ ] +, ... +}: + +{ + nativeBuildInputs = [ pkg-config ] ++ nativeBuildInputs; + buildInputs = [ libsecret jsoncpp ] ++ buildInputs; +} diff --git a/pkgs/development/compilers/flutter/package-overrides/handy-window/default.nix b/pkgs/development/compilers/flutter/package-overrides/handy-window/default.nix new file mode 100644 index 0000000000000..49b5d47487e88 --- /dev/null +++ b/pkgs/development/compilers/flutter/package-overrides/handy-window/default.nix @@ -0,0 +1,14 @@ +{ lib +, cairo +, fribidi +}: + +{ ... }: + +{ CFLAGS ? "" +, ... +}: + +{ + CFLAGS = "${CFLAGS} -isystem ${lib.getOutput "dev" fribidi}/include/fribidi -isystem ${lib.getOutput "dev" cairo}/include"; +} diff --git a/pkgs/development/compilers/flutter/package-overrides/matrix/default.nix b/pkgs/development/compilers/flutter/package-overrides/matrix/default.nix new file mode 100644 index 0000000000000..fb1adafa3208a --- /dev/null +++ b/pkgs/development/compilers/flutter/package-overrides/matrix/default.nix @@ -0,0 +1,12 @@ +{ openssl +}: + +{ ... }: + +{ runtimeDependencies ? [ ] +, ... +}: + +{ + runtimeDependencies = runtimeDependencies ++ [ openssl ]; +} diff --git a/pkgs/development/compilers/flutter/package-overrides/olm/default.nix b/pkgs/development/compilers/flutter/package-overrides/olm/default.nix new file mode 100644 index 0000000000000..e91e8f393ca7f --- /dev/null +++ b/pkgs/development/compilers/flutter/package-overrides/olm/default.nix @@ -0,0 +1,12 @@ +{ olm +}: + +{ ... }: + +{ runtimeDependencies ? [ ] +, ... +}: + +{ + runtimeDependencies = runtimeDependencies ++ [ olm ]; +} diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py index 488f415f43949..b5e900df502bb 100755 --- a/pkgs/development/compilers/llvm/update-git.py +++ b/pkgs/development/compilers/llvm/update-git.py @@ -18,14 +18,10 @@ DEFAULT_NIX = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'git/defa def get_latest_chromium_build(): - HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' - print(f'GET {HISTORY_URL}') - with urlopen(HISTORY_URL) as resp: - builds = csv.DictReader(iterdecode(resp, 'utf-8')) - for build in builds: - if build['channel'] != 'dev': - continue - return build + RELEASES_URL = 'https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/dev/versions/all/releases?filter=endtime=none&order_by=version%20desc' + print(f'GET {RELEASES_URL}') + with urlopen(RELEASES_URL) as resp: + return json.load(resp)['releases'][0] def get_file_revision(revision, file_path): diff --git a/pkgs/development/guile-modules/guile-gnutls/default.nix b/pkgs/development/guile-modules/guile-gnutls/default.nix new file mode 100644 index 0000000000000..dae082c9d11cb --- /dev/null +++ b/pkgs/development/guile-modules/guile-gnutls/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchurl +, gnutls +, guile +, libtool +, pkg-config +, texinfo +}: + +stdenv.mkDerivation rec { + pname = "guile-gnutls"; + version = "3.7.11"; + + src = fetchurl { + url = "mirror://gnu/gnutls/guile-gnutls-${version}.tar.gz"; + hash = "sha256-BY6qXHY+Gfv5PotO78ESgPgHBTXBOMmb4R8AzWhWE98="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + gnutls + guile + libtool + texinfo + ]; + + configureFlags = [ + "--with-guile-site-dir=${builtins.placeholder "out"}/share/guile/site" + "--with-guile-site-ccache-dir=${builtins.placeholder "out"}/share/guile/site" + "--with-guile-extension-dir=${builtins.placeholder "out"}/share/guile/extensions" + ]; + + meta = with lib; { + homepage = "https://gitlab.com/gnutls/guile/"; + description = "Guile bindings for GnuTLS library"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 2c6e74d0fa1af..2a6d0d1088ba3 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -2,7 +2,6 @@ , perl, gmp, autoconf, automake, libidn2, libiconv , unbound, dns-root-data, gettext, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so -, guileBindings ? config.gnutls.guile or false, guile , tpmSupport ? false, trousers, which, nettools, libunistring , withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit , Security # darwin Security.framework @@ -22,7 +21,6 @@ , samba }: -assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: @@ -74,19 +72,13 @@ stdenv.mkDerivation rec { "--with-unbound-root-key-file=${dns-root-data}/root.key" (lib.withFeature withP11-kit "p11-kit") (lib.enableFeature cxxBindings "cxx") - ] ++ lib.optionals guileBindings [ - "--enable-guile" - "--with-guile-site-dir=\${out}/share/guile/site" - "--with-guile-site-ccache-dir=\${out}/share/guile/site" - "--with-guile-extension-dir=\${out}/share/guile/site" ]; enableParallelBuilding = true; buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ] ++ lib.optional (withP11-kit) p11-kit - ++ lib.optional (tpmSupport && stdenv.isLinux) trousers - ++ lib.optional guileBindings guile; + ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; nativeBuildInputs = [ perl pkg-config ] ++ lib.optionals doCheck [ which nettools util-linux ]; diff --git a/pkgs/development/libraries/hipsparse/default.nix b/pkgs/development/libraries/hipsparse/default.nix index 769c6da0fa8fb..4f4b0c7cdc004 100644 --- a/pkgs/development/libraries/hipsparse/default.nix +++ b/pkgs/development/libraries/hipsparse/default.nix @@ -17,7 +17,7 @@ # This can also use cuSPARSE as a backend instead of rocSPARSE stdenv.mkDerivation (finalAttrs: { pname = "hipsparse"; - version = "5.4.3"; + version = "5.4.4"; outputs = [ "out" diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix b/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix new file mode 100644 index 0000000000000..16626fe0e227f --- /dev/null +++ b/pkgs/development/libraries/libfprint-2-tod1-goodix-550a/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchzip, unzip, libfprint-tod }: + +stdenv.mkDerivation { + pname = "libfprint-2-tod1-goodix-550a"; + version = "0.0.9"; + + src = fetchzip { + url = "https://download.lenovo.com/pccbbs/mobiles/r1slg01w.zip"; + sha256 = "sha256-6tp8Unu6rs27oB5VAqfRqHmv5D9N3njl5qv6We0b/Ec="; + }; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = '' + unzip $src/libfprint-tod-goodix-550a-0.0.9.zip + cd libfprint-tod-goodix-550a-0.0.9 + ar x libfprint-2-tod-goodix_amd64.deb + tar xf data.tar.xz + ''; + + buildPhase = '' + patchelf \ + --set-rpath ${lib.makeLibraryPath [ libfprint-tod ]} \ + usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-550a-$version.so + ''; + + installPhase = '' + mkdir -p "$out/lib/libfprint-2/tod-1/" + mkdir -p "$out/lib/udev/rules.d/" + + cp usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-550a-$version.so "$out/lib/libfprint-2/tod-1/" + cp lib/udev/rules.d/60-libfprint-2-tod1-goodix.rules "$out/lib/udev/rules.d/" + ''; + + passthru.driverPath = "/lib/libfprint-2/tod-1"; + + meta = with lib; { + description = "Goodix 550a driver module for libfprint-2-tod Touch OEM Driver (from Lenovo)"; + homepage = "https://support.lenovo.com/us/en/downloads/ds560884-goodix-fingerprint-driver-for-linux-thinkpad-e14-gen-4-e15-gen-4"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ utkarshgupta137 ]; + }; +} diff --git a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix index eb7de9bbc09df..c7710ce1d1991 100644 --- a/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix +++ b/pkgs/development/libraries/libfprint-2-tod1-goodix/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchgit, libfprint-tod }: + stdenv.mkDerivation { pname = "libfprint-2-tod1-goodix"; version = "0.0.6"; @@ -12,9 +13,7 @@ stdenv.mkDerivation { buildPhase = '' patchelf \ --set-rpath ${lib.makeLibraryPath [ libfprint-tod ]} \ - usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so - - ldd usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-0.0.6.so + usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-tod-goodix-53xc-$version.so ''; installPhase = '' diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index c1b7b0f11d0a2..0f2ad8406376a 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "8.1.1"; + version = "8.2.0"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t3ssScI66oJ0lT1saAFLJACAZZmfBqZP0EGUM8MykHY="; + hash = "sha256-Xh1SQNmG4lQ3f/g+i5m36LJO9JlPzP4bNqhyyKT7NEA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mathgl/default.nix b/pkgs/development/libraries/mathgl/default.nix new file mode 100644 index 0000000000000..811395d27588b --- /dev/null +++ b/pkgs/development/libraries/mathgl/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchurl +, cmake +, zlib +, libpng +, libGL +}: +stdenv.mkDerivation rec { + pname = "mathgl"; + version = "8.0.1"; + + src = fetchurl { + url = "mirror://sourceforge/mathgl/mathgl-${version}.tar.gz"; + sha256 = "sha256-yoS/lIDDntMRLpIMFs49jyiYaY9iiW86V3FBKGIqVao="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + zlib + libpng + libGL + ]; + + meta = with lib; { + description = "A library for scientific data visualization"; + homepage = "https://mathgl.sourceforge.net/"; + license = with licenses; [ gpl3 lgpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.GabrielDougherty ]; + }; +} diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix index efb2adf497f17..ccc4df86ecd12 100644 --- a/pkgs/development/libraries/rinutils/default.nix +++ b/pkgs/development/libraries/rinutils/default.nix @@ -1,20 +1,17 @@ -{ - stdenv, lib, fetchurl, - cmake, perl, +{ stdenv +, lib +, fetchurl +, cmake +, perl }: stdenv.mkDerivation rec { pname = "rinutils"; - version = "0.10.1"; - - meta = with lib; { - homepage = "https://github.com/shlomif/rinutils"; - license = licenses.mit; - }; + version = "0.10.2"; src = fetchurl { url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-MewljOmd57u+efMzjOcwSNrEVCUEXrK9DWvZLRuLmvs="; + sha256 = "sha256-2H/hGZcit/qb1QjhNTg/8HiPvX1lXL75dXwjIS+MIXs="; }; nativeBuildInputs = [ cmake perl ]; @@ -25,4 +22,13 @@ stdenv.mkDerivation rec { substituteInPlace librinutils.pc.in \ --replace '$'{exec_prefix}/@RINUTILS_INSTALL_MYLIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ ''; + + meta = with lib; { + description = "C11 / gnu11 utilities C library by Shlomi Fish / Rindolf"; + homepage = "https://github.com/shlomif/rinutils"; + changelog = "https://github.com/shlomif/rinutils/raw/${version}/NEWS.asciidoc"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = platforms.all; + }; } diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 105ebc9188eaa..3a98fc5aca5be 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiocache"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; + hash = "sha256-/ruB8/5/oWGlTldOXkgdsPU+mQlXOL1qRcikElEHYNQ="; }; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index f1c8f0bb54d08..48fbbec30de9f 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "22.0.0"; + version = "22.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-/nHR81KW3VaeP2yOSWnCDvZGyxrzK8fAn9S/RRgBhyk="; + hash = "sha256-GTfFj2XJe01RaHKUTdRm/ZRfNIvsxxmflxTcfQfaY04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 71b9e4d915ec5..e64464a2cfc1b 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.11.1"; + version = "2.11.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-nV/YZFgy4IagdJRLeg1rLTe7f2NsVnvizyMQrJhlrik="; + hash = "sha256-MjyLyIcf0NmQMHWEN/IMq68UIrkj1VgVW5RrxZe36gc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 4e74e5666893e..eec5d27a2d312 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "gcal-sync"; - version = "4.1.4"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-LJJyJj1HXNdBBs4hDvkuz74PDHRpeVpwbq0vSfESuXY="; + hash = "sha256-Z5XRyhObREj38BWnexQnwHS1y2Ewyv5/KPkl/ybHvUE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index b93cf7dee8c9d..ec8fa863f2fe6 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.13"; + version = "7.1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-Kn/I5q079b4vqi+jL/pcVKMqGgs+PYgMoByX8ZzgZ5M="; + hash = "sha256-GT9XMHzEOg04DZ/saacBfqAKc5A755m2zblJvwQjd1w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix new file mode 100644 index 0000000000000..40efd7589f213 --- /dev/null +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -0,0 +1,122 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, torch +, torchvision +, opencv4 +, yapf +, packaging +, pillow +, addict +, ninja +, which +, onnx +, onnxruntime +, scipy +, pyturbojpeg +, tifffile +, lmdb +, symlinkJoin +}: + +let + inherit (torch) cudaCapabilities cudaPackages cudaSupport; + inherit (cudaPackages) backendStdenv cudaVersion; + + cuda-common-redist = with cudaPackages; [ + cuda_cccl # <thrust/*> + libcublas # cublas_v2.h + libcusolver # cusolverDn.h + libcusparse # cusparse.h + ]; + + cuda-native-redist = symlinkJoin { + name = "cuda-native-redist-${cudaVersion}"; + paths = with cudaPackages; [ + cuda_cudart # cuda_runtime.h + cuda_nvcc + ] ++ cuda-common-redist; + }; + + cuda-redist = symlinkJoin { + name = "cuda-redist-${cudaVersion}"; + paths = cuda-common-redist; + }; + +in +buildPythonPackage rec { + pname = "mmcv"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "open-mmlab"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-b4MLBPNRCcPq1osUvqo71PCWVX7lOjAH+dXttd4ZapU"; + }; + + preConfigure = '' + export MMCV_WITH_OPS=1 + '' + lib.optionalString cudaSupport '' + export CC=${backendStdenv.cc}/bin/cc + export CXX=${backendStdenv.cc}/bin/c++ + export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}" + export FORCE_CUDA=1 + ''; + + postPatch = '' + substituteInPlace setup.py --replace "cpu_use = 4" "cpu_use = $NIX_BUILD_CORES" + ''; + + preCheck = '' + # remove the conflicting source directory + rm -rf mmcv + ''; + + # test_cnn test_ops really requires gpus to be useful. + # some of the tests take exceedingly long time. + # the rest of the tests are disabled due to sandbox env. + disabledTests = [ + "test_cnn" + "test_ops" + "test_fileclient" + "test_load_model_zoo" + "test_processing" + "test_checkpoint" + "test_hub" + "test_reader" + ]; + + nativeBuildInputs = [ ninja which ] + ++ lib.optionals cudaSupport [ cuda-native-redist ]; + + buildInputs = [ torch ] ++ lib.optionals cudaSupport [ cuda-redist ]; + + nativeCheckInputs = [ pytestCheckHook torchvision lmdb onnx onnxruntime scipy pyturbojpeg tifffile ]; + + propagatedBuildInputs = [ + torch + opencv4 + yapf + packaging + pillow + addict + ]; + + pythonImportsCheck = [ + "mmcv" + ]; + + meta = with lib; { + description = "A Foundational Library for Computer Vision Research"; + homepage = "https://github.com/open-mmlab/mmcv"; + changelog = "https://github.com/open-mmlab/mmcv/releases/tag/v${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ rxiao ]; + }; +} diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index f2452683d6ed4..584054ee111ae 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.7.0"; + version = "5.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-LVdzbmNhCSsDpb0inmgIqHugyu9ncrjpucEwV2l+cAM="; + hash = "sha256-11fa6scRcC+bQxEccCgxSJaMjwkUVs4DQj1NSaXlpb8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfibaro/default.nix b/pkgs/development/python-modules/pyfibaro/default.nix index 0f0ff8c684a7c..2a99f637f8505 100644 --- a/pkgs/development/python-modules/pyfibaro/default.nix +++ b/pkgs/development/python-modules/pyfibaro/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyfibaro"; - version = "0.7.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "rappenze"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3qE9U3yyIFl245RihcL3Kvm1NHFd42r6dvZ2Gz4sOvY="; + hash = "sha256-fgFbwMqlQcF83k345kztw/SN5j447/TuJUPYmFPKiFY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspellchecker/default.nix b/pkgs/development/python-modules/pyspellchecker/default.nix index 77e3f04e6eae6..f4cc258d3eadc 100644 --- a/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/pkgs/development/python-modules/pyspellchecker/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyspellchecker"; - version = "0.7.1"; + version = "0.7.2"; format = "pyproject"; src = fetchFromGitHub { owner = "barrust"; repo = "pyspellchecker"; rev = "refs/tags/v${version}"; - hash = "sha256-DM1Q8OirFMoYqjdSnsNL5r7Zxffxc0DEXwv1W6y8GnE="; + hash = "sha256-DV2JxUKTCVJRRLmi+d5dMloCgpYwC5uyI1o34L26TxA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix new file mode 100644 index 0000000000000..4ca120090ea3a --- /dev/null +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, click +, dacite +, fetchFromGitHub +, paho-mqtt +, poetry-core +, pycryptodome +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "python-roborock"; + version = "0.8.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "humbertogontijo"; + repo = "python-roborock"; + rev = "refs/tags/v${version}"; + hash = "sha256-O7MjxCQ4JwFFC2ibdU8hCPhFPQhV5/LsmDO6vRdyYL0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + async-timeout + click + dacite + paho-mqtt + pycryptodome + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "roborock" + ]; + + meta = with lib; { + description = "Python library & console tool for controlling Roborock vacuum"; + homepage = "https://github.com/humbertogontijo/python-roborock"; + changelog = "https://github.com/humbertogontijo/python-roborock/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 4d886196648b7..9f385b5c25843 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.8.2"; + version = "4.8.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NjoTUK1Tg2RqREI2DDT86mDO4rS5iZk+cffaGWLVSyc="; + hash = "sha256-2DR1SPWElDZcTYF6TaJK3lxqJ5Skv76X+K+y6i69bj4="; }; postPatch = '' diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index 953f2059da026..55f958356b6ce 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -77,7 +77,9 @@ gem 'iconv' gem 'idn-ruby' gem 'jbuilder' gem 'jekyll' +gem 'jekyll-archives' gem 'jekyll-favicon' +gem 'jekyll-spaceship' gem 'jekyll-webmention_io' gem 'jmespath' gem 'jwt' diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 81b7bf827cb70..c492d313cb8f9 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.93.1"; + version = "1.94.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-hd4GOsNw214nYRiyTH1GadPiqe0UErfRNUKZ7o7tysk="; + sha256 = "sha256-R/dy//e+DfyANoNtiPoAI9CF7k8ZviFgsnMrWryf0LY="; }; meta = with lib; { diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index c0b2035c7dacd..28a165e968b9c 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.15.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-+fIVkkx4UVmHnAQT2nXmBARvUsemiD42LZI3kmt/nX4="; + hash = "sha256-LxAqRkjagoHv8mLA0ysgQozIFV3gBSr0zFSN5cH8NnI="; }; vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE="; diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 96e5be555e6bc..c6a6e1b387845 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.0.22"; + version = "3.3.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-DRmG85lf6bBRtMfZ6AZSN4NuiOEe4NgUb+6u1tToZS4="; + hash = "sha256-RxZa1NH3DpHmrGbNlm85Dv1dydCC344D3lgN0lGVFt8="; }; - cargoHash = "sha256-IBzTeJy2tO5hw4IVuVkirf5jkEXWNn0vgMKZZCvCwBI="; + cargoHash = "sha256-3ZP4D2cEYzqrupYtKANRaMNNIZ83fTDoUedKCruk6CY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index ada97c3efbc64..ddede318e8a51 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -12,6 +12,7 @@ let libudev0-shim nghttp2 openssl + stdenv.cc.cc.lib ]; in stdenv.mkDerivation rec { pname = "insomnia"; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index e30f336df0dff..242e20b41503c 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.7"; + version = "0.14.8"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "10dq42d3hb6a3ln3x1rag1lqzhwqb66xn4q8k4igjkn5my81nr6q"; + sha256 = "sha256-3aZf5HINoFIJrN+196kk1lt2S+fN9DlQakwGnkMU5U8="; }; - vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; + vendorHash = null; meta = with lib; { description = "The RPKI-to-Router server used at Cloudflare"; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 56380ed4b6ee4..3f37b1b352924 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.7.4"; + version = "3.8.0"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - hash = "sha256-TBN6IwNEjyWZODaDfe6uh/rF1NA68Rrejpvq2AYyhkU="; + hash = "sha256-o62AKb0sawxXZHeg93v50sC3YcuqDvv+9Hlp7+purek="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index ccd7aaa911247..19cd13ce7e8fa 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.32.1"; + version = "0.33.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-t5rQSNLpX0ktK4mKgX6OhNLkANQ1LbFEjmQo/r7UHOM="; + sha256 = "sha256-Goj/IySGDMa8pNwU/4oXIlGqMysghNj0EjnQZtN6v1E="; }; - vendorHash = "sha256-5beHG1mZkNcDhccleqTlMA+uiV5d6SSh2QWiL4g3O28="; + vendorHash = "sha256-NqsUeTxTYQrVMJ4LYA5NC8A/PpVuy6fnKptxK+ieZAU="; proxyVendor = true; # darwin/linux hash mismatch ldflags = let diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 0bccc1bfb7a33..c6aa3a3aead7f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://pgroonga.github.io/"; license = licenses.postgresql; platforms = postgresql.meta.platforms; - maintainers = with maintainers; [ DerTim1 ivan ]; + maintainers = with maintainers; [ DerTim1 ]; }; } diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 838d22d774017..dd47a602a6f17 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-CVMY/bubX+LJs3S1GmL6oPg3A/eEHwtrDpNCObE3YV0="; + hash = "sha256-tbFRonljX/vH32/18yKs9qbs+spxLa1ZOQt2QTR8Z7o="; }; - cargoHash = "sha256-nM7WhzWALYwRkH4lotYT1PGZeDcBBSa8CtdyBWHSu8Y="; + cargoHash = "sha256-0SxFE6eMdVAU1wHvVLMClDk++Uf84InOISs1txXnIzo="; meta = with lib; { description = "An SVG rendering library"; diff --git a/pkgs/tools/networking/motrix/default.nix b/pkgs/tools/networking/motrix/default.nix index 2c6450b675540..3de4a13a4e992 100644 --- a/pkgs/tools/networking/motrix/default.nix +++ b/pkgs/tools/networking/motrix/default.nix @@ -4,26 +4,28 @@ }: let pname = "motrix"; - version = "1.6.11"; + version = "1.8.14"; src = fetchurl { url = "https://github.com/agalwood/Motrix/releases/download/v${version}/Motrix-${version}.AppImage"; - sha256 = "sha256-tE2Q7NM+cQOg+vyqyfRwg05EOMQWhhggTA6S+VT+SkM="; + hash = "sha256-h4TZzExl1zThwzlKBtL0u3V1jFjjNM2Cscy4hGir9Ts="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in -appimageTools.wrapType2 rec { +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + + install -Dm 444 ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { @@ -31,6 +33,7 @@ appimageTools.wrapType2 rec { homepage = "https://motrix.app"; license = licenses.mit; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ dit7ya ]; }; } diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 713bf400f4b1b..ab15b8dac61bb 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nfdump"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; rev = "refs/tags/v${version}"; - hash = "sha256-oCaJPx6+C0NQSuUcsP54sycNLt/zaqe5c81dwHNBcnQ="; + hash = "sha256-ns/RG0kyu2b0UjcJKArcAjY+dI397ljhrUO8euS5Snk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/picosnitch/default.nix b/pkgs/tools/networking/picosnitch/default.nix new file mode 100644 index 0000000000000..03df8639d1827 --- /dev/null +++ b/pkgs/tools/networking/picosnitch/default.nix @@ -0,0 +1,38 @@ +{ lib +, python3 +, bcc +}: + +python3.pkgs.buildPythonApplication rec { + pname = "picosnitch"; + version = "0.12.0"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "b87654b4b92e28cf5418388ba1d3165b9fa9b17ba91af2a1a942f059128f68bc"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + setuptools + bcc + psutil + dbus-python + requests + pandas + plotly + dash + ]; + + patches = [ ./picosnitch.patch ]; + + pythonImportsCheck = [ "picosnitch" ]; + + meta = with lib; { + description = "Monitor network traffic per executable with hashing"; + homepage = "https://github.com/elesiuta/picosnitch"; + changelog = "https://github.com/elesiuta/picosnitch/releases"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.elesiuta ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/picosnitch/picosnitch.patch b/pkgs/tools/networking/picosnitch/picosnitch.patch new file mode 100644 index 0000000000000..fb4433a6f4b85 --- /dev/null +++ b/pkgs/tools/networking/picosnitch/picosnitch.patch @@ -0,0 +1,111 @@ +diff --git a/picosnitch.py b/picosnitch.py +index a3dbb07..2b74f3e 100755 +--- a/picosnitch.py ++++ b/picosnitch.py +@@ -1356,7 +1356,7 @@ def ui_loop(stdscr: curses.window, splash: str, con: sqlite3.Connection) -> int: + update_query = False + if execute_query: + try: +- with open("/run/picosnitch.pid", "r") as f: ++ with open("/run/picosnitch/picosnitch.pid", "r") as f: + run_status = "pid: " + f.read().strip() + except Exception: + run_status = "not running" +@@ -1603,7 +1603,7 @@ def ui_dash(): + return cmdline + def serve_layout(): + try: +- with open("/run/picosnitch.pid", "r") as f: ++ with open("/run/picosnitch/picosnitch.pid", "r") as f: + run_status = "pid: " + f.read().strip() + except Exception: + run_status = "not running" +@@ -1771,7 +1771,7 @@ def main(): + # master copy of the snitch dictionary, all subprocesses only receive a static copy of it from this point in time + snitch = read_snitch() + # start picosnitch process monitor +- with open("/run/picosnitch.pid", "r") as f: ++ with open("/run/picosnitch/picosnitch.pid", "r") as f: + assert int(f.read().strip()) == os.getpid() + if __name__ == "__main__" or sys.argv[1] == "start-no-daemon": + sys.exit(main_process(snitch)) +@@ -1818,7 +1818,7 @@ def start_picosnitch(): + RestartSec=5 + Environment="SUDO_UID={os.getenv("SUDO_UID")}" "SUDO_USER={os.getenv("SUDO_USER")}" "DBUS_SESSION_BUS_ADDRESS={os.getenv("DBUS_SESSION_BUS_ADDRESS")}" "PYTHON_USER_SITE={site.USER_SITE}" + ExecStart={sys.executable} "{os.path.abspath(__file__)}" start-no-daemon +- PIDFile=/run/picosnitch.pid ++ PIDFile=/run/picosnitch/picosnitch.pid + + [Install] + WantedBy=multi-user.target +@@ -1832,12 +1832,12 @@ def start_picosnitch(): + subprocess.Popen(["bash", "-c", f'let i=0; rm {BASE_PATH}/dash; while [[ ! -f {BASE_PATH}/dash || "$i" -gt 30 ]]; do let i++; sleep 1; done; rm {BASE_PATH}/dash && /usr/bin/env python3 -m webbrowser -t http://{os.getenv("HOST", "localhost")}:{os.getenv("PORT", "5100")}'], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + if os.getuid() != 0: + args = ["sudo", "-E", sys.executable, os.path.abspath(__file__), sys.argv[1]] +- os.execvp("sudo", args) ++ assert sys.argv[1] not in ["start", "stop", "restart", "start-no-daemon"], "picosnitch requires root privileges to run" + with open("/proc/self/status", "r") as f: + proc_status = f.read() + capeff = int(proc_status[proc_status.find("CapEff:")+8:].splitlines()[0].strip(), base=16) + cap_sys_admin = 2**21 +- assert capeff & cap_sys_admin, "Missing capability CAP_SYS_ADMIN" ++ assert sys.argv[1] not in ["start", "stop", "restart", "start-no-daemon"] or (capeff & cap_sys_admin), "Missing capability CAP_SYS_ADMIN" + assert importlib.util.find_spec("bcc"), "Requires BCC https://github.com/iovisor/bcc/blob/master/INSTALL.md" + tmp_snitch = read_snitch() + con = sqlite3.connect(os.path.join(BASE_PATH, "snitch.db")) +@@ -1883,8 +1883,8 @@ def start_picosnitch(): + except Exception as e: + print("Warning: %s%s on line %s" % (type(e).__name__, str(e.args), sys.exc_info()[2].tb_lineno), file=sys.stderr) + if sys.argv[1] in ["start", "stop", "restart"]: +- if os.path.exists("/usr/lib/systemd/system/picosnitch.service"): +- print("Found /usr/lib/systemd/system/picosnitch.service but you are not using systemctl") ++ if os.path.exists("/usr/lib/systemd/system/picosnitch.service") or os.path.exists("/etc/systemd/system/picosnitch.service"): ++ print("Found picosnitch.service but you are not using systemctl") + if sys.stdin.isatty(): + confirm = input(f"Did you intend to run `systemctl {sys.argv[1]} picosnitch` (y/N)? ") + if confirm.lower().startswith("y"): +@@ -1893,15 +1893,15 @@ def start_picosnitch(): + class PicoDaemon(Daemon): + def run(self): + main() +- daemon = PicoDaemon("/run/picosnitch.pid") ++ daemon = PicoDaemon("/run/picosnitch/picosnitch.pid") + if sys.argv[1] == "start": +- print("starting picosnitch daemon") ++ print("starting picosnitch daemon, WARNING: built in daemon mode is not supported on Nix, use picosnitch start-no-daemon or systemctl instead") + daemon.start() + elif sys.argv[1] == "stop": +- print("stopping picosnitch daemon") ++ print("stopping picosnitch daemon, WARNING: built in daemon mode is not supported on Nix, use picosnitch start-no-daemon or systemctl instead") + daemon.stop() + elif sys.argv[1] == "restart": +- print("restarting picosnitch daemon") ++ print("restarting picosnitch daemon, WARNING: built in daemon mode is not supported on Nix, use picosnitch start-no-daemon or systemctl instead") + daemon.restart() + elif sys.argv[1] == "status": + daemon.status() +@@ -1912,11 +1912,12 @@ def start_picosnitch(): + print("Wrote /usr/lib/systemd/system/picosnitch.service\nYou can now run picosnitch using systemctl") + return 0 + elif sys.argv[1] == "start-no-daemon": +- assert not os.path.exists("/run/picosnitch.pid") ++ assert not os.path.exists("/run/picosnitch/picosnitch.pid") + def delpid(): +- os.remove("/run/picosnitch.pid") ++ os.remove("/run/picosnitch/picosnitch.pid") + atexit.register(delpid) +- with open("/run/picosnitch.pid", "w") as f: ++ os.makedirs("/run/picosnitch", exist_ok=True) ++ with open("/run/picosnitch/picosnitch.pid", "w") as f: + f.write(str(os.getpid()) + "\n") + print("starting picosnitch in simple mode") + print(f"using config and log files from: {BASE_PATH}") +@@ -1927,7 +1928,7 @@ def start_picosnitch(): + assert dash.__version__ and pandas.__version__ and plotly.__version__ + print(f"serving web gui on http://{os.getenv('HOST', 'localhost')}:{os.getenv('PORT', '5100')}") + args = ["bash", "-c", f"sudo -i -u {os.getenv('SUDO_USER')} touch {BASE_PATH}/dash; nohup {sys.executable} \"{os.path.abspath(__file__)}\" start-dash > /dev/null 2>&1 &"] +- os.execvp("bash", args) ++ return ui_dash() + elif sys.argv[1] == "start-dash": + return ui_dash() + elif sys.argv[1] == "view": diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index 83ddb84163b00..503c83d4fe151 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -26,16 +26,16 @@ in rustPlatform.buildRustPackage rec { pname = "nix-init"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; rev = "v${version}"; - hash = "sha256-eiPUJj87PU4EgMQRJ4Yv5d/y94j5AklbP1sVNXNSNPs="; + hash = "sha256-QxGPBGCCjbQ1QbJNoW0dwQS/srwQ0hBR424zmcqdjI8="; }; - cargoHash = "sha256-OKHW5q8bvJiwJAAEr9AHEWoDCwDKr6ACxsFRtJOTNis="; + cargoHash = "sha256-+Vj3TqNxMgaUmhzCgSEGl58Jh1PLsC6q/DfDbfg2mmo="; nativeBuildInputs = [ curl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 767f293f61aca..0bfebbf56bd3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2147,6 +2147,8 @@ with pkgs; ### APPLICATIONS/EMULATORS + _86Box = callPackage ../applications/emulators/86box { }; + atari800 = callPackage ../applications/emulators/atari800 { }; ataripp = callPackage ../applications/emulators/atari++ { }; @@ -9195,6 +9197,8 @@ with pkgs; ltwheelconf = callPackage ../applications/misc/ltwheelconf { }; + lunatask = callPackage ../applications/misc/lunatask { }; + lvmsync = callPackage ../tools/backup/lvmsync { }; kapp = callPackage ../tools/networking/kapp { }; @@ -17243,6 +17247,8 @@ with pkgs; guile-git = callPackage ../development/guile-modules/guile-git { }; + guile-gnutls = callPackage ../development/guile-modules/guile-gnutls { }; + guile-json = callPackage ../development/guile-modules/guile-json { }; guile-lib = callPackage ../development/guile-modules/guile-lib { }; @@ -21500,6 +21506,8 @@ with pkgs; libfprint-2-tod1-goodix = callPackage ../development/libraries/libfprint-2-tod1-goodix { }; + libfprint-2-tod1-goodix-550a = callPackage ../development/libraries/libfprint-2-tod1-goodix-550a { }; + libfprint-2-tod1-vfs0090 = callPackage ../development/libraries/libfprint-2-tod1-vfs0090 { }; libfpx = callPackage ../development/libraries/libfpx { }; @@ -22613,6 +22621,8 @@ with pkgs; marisa = callPackage ../development/libraries/marisa { }; + mathgl = callPackage ../development/libraries/mathgl { }; + matio = callPackage ../development/libraries/matio { }; matterhorn = haskell.lib.compose.justStaticExecutables haskellPackages.matterhorn; @@ -31254,7 +31264,7 @@ with pkgs; }; iksemel = callPackage ../development/libraries/iksemel { - texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. + texinfo = buildPackages.texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8. }; avalonia-ilspy = callPackage ../applications/misc/avalonia-ilspy { }; @@ -33093,6 +33103,8 @@ with pkgs; picoloop = callPackage ../applications/audio/picoloop { }; + picosnitch = callPackage ../tools/networking/picosnitch { }; + pidgin = callPackage ../applications/networking/instant-messengers/pidgin { withOpenssl = config.pidgin.openssl or true; withGnutls = config.pidgin.gnutls or false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e709233004285..bcefc8dea1210 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6171,6 +6171,8 @@ self: super: with self; { enablePython = true; }); + mmcv = callPackage ../development/python-modules/mmcv { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; mmpython = callPackage ../development/python-modules/mmpython { }; @@ -9721,6 +9723,8 @@ self: super: with self; { python-registry = callPackage ../development/python-modules/python-registry { }; + python-roborock = callPackage ../development/python-modules/python-roborock { }; + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices; }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 5c96f9c0372c2..98364e6a0c20b 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.4"; }; algoliasearch = { dependencies = ["httpclient" "json"]; @@ -168,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0agdfwdrvxpikm85ddx5m1nvy8rn321zjn66sxb12pwd0dzb9qsf"; + sha256 = "0l3xb57zzzfxryir2ssrl6lai4pvszal54fhss50niyi3pzbjdfx"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; atomos = { groups = ["default"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q6075p69xrg92q6061smdjwcia3fyg2k0sn0hb6590ncj619z5k"; + sha256 = "0hgrfxzhh9h3jrvaarxa663vzyd5y0s03310zkarbl8bcxd2iwm5"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; camping = { dependencies = ["mab" "rack"]; @@ -343,10 +343,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "071kl1d0wi0v3w4gqjh9hzf8jclk59m2xn5dynmr0waammmm1yhw"; + sha256 = "0c25gpi6vrv4fvhwfqscjq5pqqg3g3s3vjm6z8xmgbi9bl9m7ws8"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; cocoapods-acknowledgements = { dependencies = ["cocoapods" "redcarpet" "xcodeproj"]; @@ -406,10 +406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gz84agvxbcp7ngkixkgyj9dcjd3q4q8qffx0b75kzg8p31ywl5b"; + sha256 = "03hz6i56603j3zlxy9is74bgs88isrnj9y7xc6wakr4c0m238hv9"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.1"; }; cocoapods-coverage = { dependencies = ["cocoapods-testing" "slather"]; @@ -685,10 +685,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q4ai2i4rswhq5l46ny5066z8pavj3j0qvr9hbgqvzj677fa335f"; + sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; type = "gem"; }; - version = "0.23.8"; + version = "0.23.9"; }; concurrent-ruby = { groups = ["default"]; @@ -796,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "135a8r9nq10wlzbjm74dflls67y9iiwp04aj1089ablbmvbiiq41"; + sha256 = "0x8fcwqn6b1l227w38l4hy6i28cpbfbp2yrmklgfy8nb7hq2k1gk"; type = "gem"; }; - version = "1.1.0"; + version = "1.0.2"; }; dip = { dependencies = ["thor"]; @@ -818,10 +818,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v8jfxamsdvs8rdl28ylcp5xphb03kmf5f1aqrnr2020ras618kc"; + sha256 = "17bjlic4ac9980vas3pgnhi5lkisq28vd730bhcg8jdh8xcp6r48"; type = "gem"; }; - version = "1.61.9"; + version = "1.70.0"; }; do_sqlite3 = { dependencies = ["data_objects"]; @@ -1089,10 +1089,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f6mgq07wqn59499wzk3sp1ip2lp5a7kask0cb27z2s8as4p9fr9"; + sha256 = "02yn2jl0bz6kadx5851545rpqnfqd6gzbk2js9fj318jx9kl7r2m"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; gemoji = { groups = ["default"]; @@ -1120,10 +1120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqqk5y51mw5qj02zfz4ddmli1i939gq9ba8gr1mlh34xwia4ack"; + sha256 = "12hyzvy3853qrlcczmaq5p31lv16klgnkz598amia3kphgbdg5rb"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -1174,10 +1174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15pk94bzb4wcx9i4zimsl238jq5198h4n9mqsf83m4cisj79mv2p"; + sha256 = "1vapcxmbyfpgid5blm0m6j3g5cajhpr2317yhvfbpa2mgfwjyj4p"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; globalid = { dependencies = ["activesupport"]; @@ -1196,10 +1196,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02am50x194wsww08sv9414v6azb6pzmwgyi5dng41w7ihcf41qnf"; + sha256 = "1q2mjah6w9lxc6b4ys3rwclqf1fy55x4jjxp7rn2bz6whq768b80"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1372,10 +1372,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; iconv = { groups = ["default"]; @@ -1440,6 +1440,17 @@ }; version = "3.9.3"; }; + jekyll-archives = { + dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c2rks7xf6ajp18h4f4wmmbqm5ljprv70bqcz2sabi17zncmz9n0"; + type = "gem"; + }; + version = "2.2.1"; + }; jekyll-avatar = { dependencies = ["jekyll"]; groups = ["default"]; @@ -1659,6 +1670,17 @@ }; version = "1.4.0"; }; + jekyll-spaceship = { + dependencies = ["gemoji" "jekyll" "nokogiri" "rainbow"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "142bp48vq9aqwpqig54anbv7ncwqv1h78mbqhckmnx0glnqlkyzh"; + type = "gem"; + }; + version = "0.10.2"; + }; jekyll-swiss = { groups = ["default"]; platforms = []; @@ -1997,10 +2019,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; + sha256 = "1mi4ia13fisc97fzd8xcd9wkjdki7zfbmdn1xkdzplicir68gyp8"; type = "gem"; }; - version = "2.19.1"; + version = "2.20.0"; }; mab = { groups = ["default"]; @@ -2328,10 +2350,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -2339,10 +2361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7"; + sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v"; type = "gem"; }; - version = "1.14.2"; + version = "1.14.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2425,20 +2447,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pmjf0rkplw528xj40fgzaa600x73zviccq9h0jqd21kd0fnhac7"; + sha256 = "0i96sa4av0zg85dmwbvjgmhgspbv98a057w5bg20qq1zcr5v31kv"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; type = "gem"; }; - version = "1.22.1"; + version = "1.23.0"; }; parser = { dependencies = ["ast"]; @@ -2446,10 +2468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx"; + sha256 = "08f89nssj7ws7sjfvc2fcjpfm83sjgmniyh0npnmpqf5sfv44r8x"; type = "gem"; }; - version = "3.2.2.0"; + version = "3.2.2.1"; }; paru = { groups = ["default"]; @@ -2508,10 +2530,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07m6lxljabw9kyww5k5lgsxsznsm1v5l14r1la09gqka9b5kv3yr"; + sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb"; type = "gem"; }; - version = "1.4.6"; + version = "1.5.3"; }; pkg-config = { groups = ["default"]; @@ -2603,10 +2625,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qqd5lb3mamh53ssx0xavmspg4blhq6hd1kipksw20bq71xcklf5"; + sha256 = "0yf4jmkyy8das7pj1xzwllfvzkhq2p6p534j61d9h4wz3nfyf0s5"; type = "gem"; }; - version = "6.2.1"; + version = "6.2.2"; }; racc = { groups = ["default"]; @@ -2623,10 +2645,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.4"; + version = "2.2.7"; }; rack-protection = { dependencies = ["rack"]; @@ -2634,10 +2656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; rack-test = { dependencies = ["rack"]; @@ -2761,10 +2783,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022kb34sinp5mnnzrj40yqda7kr6gyipd815yqc47yrrgk4zw3zv"; + sha256 = "0dgj5n7rj83981fvrhswfwsh88x42p7r00nvd80hkxmdcjvda2h6"; type = "gem"; }; - version = "3.0.4"; + version = "2.8.4"; }; rchardet = { groups = ["default"]; @@ -2856,10 +2878,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q"; + sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -2941,10 +2963,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; - version = "3.12.1"; + version = "3.12.2"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2952,10 +2974,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; - version = "3.12.2"; + version = "3.12.3"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -2984,10 +3006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s5yrn6f63px4051kjr78kgg1zacqlv8z5x5lbwb5swgp8b75kqq"; + sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw"; type = "gem"; }; - version = "1.48.1"; + version = "1.50.2"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3006,10 +3028,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + sha256 = "1z6i24r0485fxa5n4g3rhp88w589fifszhd1khbzya2iiknkjxkr"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.1"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -3204,10 +3226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1npjwh7hjnzjrd8ybb4gbr2hpnsxspadsq2s4d7cb5j5iz8xd9jy"; + sha256 = "1qajss2mc8rw9pxgfjl4mxacnss5xnr603ydms0knmm6cb61vlb4"; type = "gem"; }; - version = "5.66.0"; + version = "5.67.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3268,10 +3290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ryfja9yd3fq8n1p5yi3qnd0pjk7bkycmxxmbb1bj0axlr1pdv20"; + sha256 = "1q0ghxfqgjhg2dq9699mn5qx6m6q2cgldg312kh41pzwwy71a7hx"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; slather = { dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"]; @@ -3315,15 +3337,15 @@ version = "1.3.2"; }; solargraph = { - dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "rbs" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdy2f5phffknx98j2f5k72s52ayp456m3jkg08vx396yg59l0gi"; + sha256 = "18wpma2mgw82qzf1jwjalmz7nwdvn87b22wd5yy16jb67fqgrq78"; type = "gem"; }; - version = "0.48.0"; + version = "0.49.0"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3586,16 +3608,6 @@ }; version = "7.0.0"; }; - webrick = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; - type = "gem"; - }; - version = "1.7.0"; - }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; @@ -3649,25 +3661,24 @@ version = "0.2.2"; }; yard = { - dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; + sha256 = "013yrnwx1zhzhn1fnc19zck22a1qgimsaglp2iwgf5bz9l8h93js"; type = "gem"; }; - version = "0.9.28"; + version = "0.9.34"; }; zeitwerk = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; + sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; type = "gem"; }; - version = "2.6.7"; + version = "2.6.8"; }; zookeeper = { groups = ["default"]; |